Skip to content

Commit 158395e

Browse files
committed
Always use the current version of the Android script
1 parent 6187fcc commit 158395e

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

.github/workflows/swift_package_test.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,28 @@ jobs:
528528
- name: Checkout repository
529529
uses: actions/checkout@v1
530530
if: ${{ matrix.os_version == 'amazonlinux2' }}
531+
- name: Checkout swiftlang/github-workflows repository
532+
if: ${{ matrix.os_version != 'amazonlinux2' && github.repository != 'swiftlang/github-workflows' }}
533+
uses: actions/checkout@v4
534+
with:
535+
repository: swiftlang/github-workflows
536+
ref: ${{ github.ref }}
537+
path: github-workflows
538+
- name: Checkout swiftlang/github-workflows repository
539+
if: ${{ matrix.os_version == 'amazonlinux2' && github.repository != 'swiftlang/github-workflows' }}
540+
uses: actions/checkout@v1
541+
with:
542+
repository: swiftlang/github-workflows
543+
ref: ${{ github.ref }}
544+
path: github-workflows
545+
- name: Determine script-root path
546+
id: script_path
547+
run: |
548+
if [ "${{ github.repository }}" = "swiftlang/github-workflows" ]; then
549+
echo "root=$GITHUB_WORKSPACE" >> $GITHUB_OUTPUT
550+
else
551+
echo "root=github-workflows" >> $GITHUB_OUTPUT
552+
fi
531553
- name: Provide token
532554
if: ${{ inputs.needs_token }}
533555
run: |
@@ -558,8 +580,8 @@ jobs:
558580
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
559581
exit 1
560582
fi
561-
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
562-
bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ join(fromJson(inputs.android_sdk_triples), ' --android-sdk-triple=') }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
583+
ls -la
584+
${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple=${{ join(fromJson(inputs.android_sdk_triples), ' --android-sdk-triple=') }} --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
563585
564586
windows-build:
565587
name: Windows (${{ matrix.swift_version }} - windows-2022)

0 commit comments

Comments
 (0)