Author: marcprux

.github/workflows/pull_request.yml

@@ -90,7 +90,7 @@ jobs:
           HOST_OS=ubuntu$(lsb_release -sr)
           source ./scripts/toolchain-vars.sh
           mkdir -p ${{ runner.temp }}/swift-android-sdk/host-toolchain
-          ./scripts/install-swift.sh ${{ runner.temp }}/swift-android-sdk/host-toolchain
+          ./scripts/install-swift.sh ${{ runner.temp }}/swift-android-sdk/host-toolchain/$SWIFT_BASE/usr
           ls ${{ runner.temp }}/swift-android-sdk/host-toolchain
           ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr/bin/swift --version
       - name: Get artifact info

swift-ci/sdks/android/build-local

@@ -20,12 +20,11 @@ HOST_OS=ubuntu$(lsb_release -sr)
 source ./scripts/toolchain-vars.sh
 
 SWIFT_ROOT=${WORKDIR}/host-toolchain
+HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
 if [[ ! -d "$SWIFT_ROOT/$SWIFT_BASE" ]]; then
-    ./scripts/install-swift.sh ${SWIFT_ROOT}
+    ./scripts/install-swift.sh ${HOST_TOOLCHAIN}
 fi
 
-#HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-$(dirname $(dirname $(which swiftc)))}
-HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
 $HOST_TOOLCHAIN/bin/swift --version
 
 # ensure the correct Swift is first in the PATH

swift-ci/sdks/android/scripts/install-swift.sh

@@ -33,24 +33,19 @@ export GNUPGHOME="$tmpdir"
 
 # Fetch the toolchain and signature
 echo "Going to fetch ${SWIFT_TOOLCHAIN_URL}"
-
 curl -fsSL "${SWIFT_TOOLCHAIN_URL}" -o toolchain.tar.gz
 
 echo "Going to fetch ${SWIFT_TOOLCHAIN_URL}.sig"
-
 curl -fsSL "${SWIFT_TOOLCHAIN_URL}.sig" -o toolchain.sig
 
 echo "Fetching keys"
-
 curl -fsSL --compressed https://swift.org/keys/all-keys.asc | gpg --import -
 
 echo "Verifying signature"
-
 gpg --batch --verify toolchain.sig toolchain.tar.gz
 
 # Extract and install the toolchain
 echo "Extracting Swift"
-
 mkdir -p ${destination}
 tar -xzf toolchain.tar.gz --directory ${destination} --strip-components=2
 chmod -R o+r ${destination}/lib/swift