Author: marcprux

.github/workflows/pull_request.yml

@@ -85,13 +85,14 @@ jobs:
         if: ${{ matrix.build-type == 'docker' }}
         working-directory: swift-ci/sdks/android
         run: |
-          # when building in a Docker container, we don't have a host toolchain
-          # locally, but we need one in order to run the SDK validation tests
+          # when building in a Docker container, we don't have a local host toolchain,
+          # but we need one in order to run the SDK validation tests, so we install it now
           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/swift
-          ${{ runner.temp }}/swift-android-sdk/host-toolchain/swift/bin/swift --version
+          ./scripts/install-swift.sh ${{ runner.temp }}/swift-android-sdk/host-toolchain
+          ls ${{ runner.temp }}/swift-android-sdk/host-toolchain
+          ${{ runner.temp }}/swift-android-sdk/host-toolchain/*/usr/bin/swift --version
       - name: Get artifact info
         id: info
         shell: bash

swift-ci/sdks/android/build-local

@@ -21,13 +21,7 @@ source ./scripts/toolchain-vars.sh
 
 SWIFT_ROOT=${WORKDIR}/host-toolchain
 if [[ ! -d "$SWIFT_ROOT/$SWIFT_BASE" ]]; then
-    mkdir -p $SWIFT_ROOT
-    pushd $SWIFT_ROOT
-
-    wget -q $SWIFT_TOOLCHAIN_URL
-    tar xzf $SWIFT_BASE.tar.gz
-
-    popd
+    ./scripts/install-swift.sh ${SWIFT_ROOT}
 fi
 
 #HOST_TOOLCHAIN=${HOST_TOOLCHAIN:-$(dirname $(dirname $(which swiftc)))}