Work around the SwiftPM layout change. (#2389)
Motivation: SwiftPM has changed its default layout for packages in apple/swift-package-manager#6144. This breaks our CI, which assumes the prior layout. We should work around this. Modifications: Enhance the code to tolerate both layouts. Result: Integration tests run on all platforms
This commit is contained in:
parent
e208367c8e
commit
61043a36f6
|
@ -16,6 +16,11 @@
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
function make_package() {
|
function make_package() {
|
||||||
|
if [[ ! -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
|
||||||
|
mkdir "$tmpdir/syscallwrapper/Sources/syscallwrapper/"
|
||||||
|
mv "$tmpdir"/syscallwrapper/Sources/*.swift "$tmpdir/syscallwrapper/Sources/syscallwrapper/"
|
||||||
|
fi
|
||||||
|
|
||||||
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
|
cat > "$tmpdir/syscallwrapper/Package.swift" <<"EOF"
|
||||||
// swift-tools-version:5.5
|
// swift-tools-version:5.5
|
||||||
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
// The swift-tools-version declares the minimum version of Swift required to build this package.
|
||||||
|
|
|
@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
|
||||||
mkdir "$tmpdir/syscallwrapper"
|
mkdir "$tmpdir/syscallwrapper"
|
||||||
cd "$tmpdir/syscallwrapper"
|
cd "$tmpdir/syscallwrapper"
|
||||||
swift package init --type=executable
|
swift package init --type=executable
|
||||||
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
|
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
|
||||||
|
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat > "$main_path" <<EOF
|
||||||
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
||||||
import Darwin
|
import Darwin
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
|
||||||
mkdir "$tmpdir/syscallwrapper"
|
mkdir "$tmpdir/syscallwrapper"
|
||||||
cd "$tmpdir/syscallwrapper"
|
cd "$tmpdir/syscallwrapper"
|
||||||
swift package init --type=executable
|
swift package init --type=executable
|
||||||
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
|
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
|
||||||
|
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat > "$main_path" <<EOF
|
||||||
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
||||||
import Darwin
|
import Darwin
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -30,7 +30,13 @@ tmpdir=$(mktemp -d /tmp/.swift-nio-syscall-wrappers-sh-test_XXXXXX)
|
||||||
mkdir "$tmpdir/syscallwrapper"
|
mkdir "$tmpdir/syscallwrapper"
|
||||||
cd "$tmpdir/syscallwrapper"
|
cd "$tmpdir/syscallwrapper"
|
||||||
swift package init --type=executable
|
swift package init --type=executable
|
||||||
cat > "$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift" <<EOF
|
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/main.swift"
|
||||||
|
if [[ -d "$tmpdir/syscallwrapper/Sources/syscallwrapper/" ]]; then
|
||||||
|
main_path="$tmpdir/syscallwrapper/Sources/syscallwrapper/main.swift"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat > "$main_path" <<EOF
|
||||||
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
|
||||||
import Darwin
|
import Darwin
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue