Skip to content

Commit 571252e

Browse files
committed
Update environment to use SWIFT_VERSION
1 parent 7ca50ac commit 571252e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/build_android_sdk.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
#arch: ['x86_64']
2323
# build both the quick (x86_64) and complete (aarch64,x86_64,armv7) SDKs
2424
#arch: ['x86_64', '']
25-
#swift-version: ['release', 'swift-6.2-branch', 'development']
25+
#swift-version: ['swift-6.2-RELEASE', 'swift-6.3-branch', 'development']
2626
swift-version: ['swift-6.2-branch', 'development']
2727
runs-on: ubuntu-24.04
2828
steps:
@@ -48,19 +48,20 @@ jobs:
4848
echo "BUILD_SCHEME=${{ matrix.swift-version }}" >> $GITHUB_ENV
4949
echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
5050
echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
51-
SWIFT_VERSION=$(curl -fsSL https://download.swift.org/${{ matrix.swift-version }}/ubuntu2404/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
52-
echo "SWIFT_VERSION=${SWIFT_VERSION}" >> $GITHUB_ENV
51+
# fetch the tag associated with the latest published build for the specific Swift version
52+
SWIFT_TAG=$(curl -fsSL https://download.swift.org/${{ matrix.swift-version }}/ubuntu2404/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
53+
echo "SWIFT_TAG=${SWIFT_TAG}" >> $GITHUB_ENV
5354
- name: Build Android SDK (Local)
5455
if: ${{ matrix.build-type == 'local' }}
5556
working-directory: swift-ci/sdks/android
5657
run: |
5758
sudo apt install -q ninja-build patchelf
58-
./build-local tag:${SWIFT_VERSION} ${WORKDIR}
59+
./build-local tag:${SWIFT_TAG} ${WORKDIR}
5960
- name: Build Android SDK (Docker)
6061
if: ${{ matrix.build-type == 'docker' }}
6162
working-directory: swift-ci/sdks/android
6263
run: |
63-
./build-docker tag:${SWIFT_VERSION} ${WORKDIR}
64+
./build-docker tag:${SWIFT_TAG} ${WORKDIR}
6465
- name: Install Host Toolchain
6566
if: ${{ matrix.build-type == 'docker' }}
6667
working-directory: swift-ci/sdks/android
@@ -69,6 +70,7 @@ jobs:
6970
# local host toolchain, but we need one in order to run
7071
# the SDK validation tests, so we install it now
7172
HOST_OS=ubuntu$(lsb_release -sr)
73+
SWIFT_VERSION="tag:${SWIFT_TAG}"
7274
source ./scripts/toolchain-vars.sh
7375
mkdir -p ${WORKDIR}/host-toolchain
7476
./scripts/install-swift.sh ${WORKDIR}/host-toolchain/$SWIFT_BASE/usr

0 commit comments

Comments
 (0)