Skip to content

Commit 96cadb1

Browse files
committed
Update CI to use tag from latest-build.yml
1 parent 15e8c62 commit 96cadb1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/build_android_sdk.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
# build both the quick (x86_64) and complete (aarch64,x86_64,armv7) SDKs
2424
#arch: ['x86_64', '']
2525
#swift-version: ['release', 'swift-6.2-branch', 'development']
26-
#swift-version: ['swift-6.2-branch', 'development']
27-
swift-version: ['scheme:release/6.2', 'scheme:main']
26+
swift-version: ['swift-6.2-branch', 'development']
2827
runs-on: ubuntu-24.04
2928
steps:
3029
- name: Checkout swift-docker
@@ -49,17 +48,19 @@ jobs:
4948
echo "BUILD_SCHEME=${{ matrix.swift-version }}" >> $GITHUB_ENV
5049
echo "TARGET_ARCHS=${{ matrix.arch }}" >> $GITHUB_ENV
5150
echo "WORKDIR=${{ runner.temp }}/swift-android-sdk" >> $GITHUB_ENV
51+
SWIFT_TAG=$(curl -fsSL https://download.swift.org/${{ matrix.swift-version }}/ubuntu2404/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
52+
echo "SWIFT_TAG=${SWIFT_TAG}" >> $GITHUB_ENV
5253
- name: Build Android SDK (Local)
5354
if: ${{ matrix.build-type == 'local' }}
5455
working-directory: swift-ci/sdks/android
5556
run: |
5657
sudo apt install -q ninja-build patchelf
57-
./build-local ${BUILD_SCHEME} ${WORKDIR}
58+
./build-local tag:${SWIFT_TAG} ${WORKDIR}
5859
- name: Build Android SDK (Docker)
5960
if: ${{ matrix.build-type == 'docker' }}
6061
working-directory: swift-ci/sdks/android
6162
run: |
62-
./build-docker ${BUILD_SCHEME} ${WORKDIR}
63+
./build-docker tag:${SWIFT_TAG} ${WORKDIR}
6364
- name: Install Host Toolchain
6465
if: ${{ matrix.build-type == 'docker' }}
6566
working-directory: swift-ci/sdks/android

0 commit comments

Comments
 (0)