Skip to content

Various fixes for Amazon Linux 2 #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 20, 2025
Merged

Various fixes for Amazon Linux 2 #188

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ed0ee7
Add missing executable bit to install-and-build-with-sdk.sh script
jakepetroules Nov 19, 2025
bbfd1ad
Don't use unnecessary piping
jakepetroules Nov 19, 2025
981d04b
Check out github-workflows into subdirectory
jakepetroules Nov 19, 2025
d4d99bf
Stop installing curl when we don't need it
jakepetroules Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified .github/workflows/scripts/install-and-build-with-sdk.sh
100644 → 100755
View file
Open in desktop
Empty file.
22 changes: 9 additions & 13 deletions .github/workflows/swift_package_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ jobs:
uses: actions/checkout@v1
with:
repository: swiftlang/github-workflows
path: github-workflows
path: ${{ github.event.repository.name }}/github-workflows
ref: main
- name: Determine script-root path
id: script_path
Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:
uses: actions/checkout@v1
with:
repository: swiftlang/github-workflows
path: github-workflows
path: ${{ github.event.repository.name }}/github-workflows
ref: main
- name: Determine script-root path
id: script_path
Expand Down Expand Up @@ -432,8 +432,7 @@ jobs:
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
exit 1
fi
cat ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh | \
bash -s -- --static --flags="$BUILD_FLAGS" --build-command="${{ inputs.linux_static_sdk_build_command }}" ${{ matrix.swift_version }}
${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh --static --flags="$BUILD_FLAGS" --build-command="${{ inputs.linux_static_sdk_build_command }}" ${{ matrix.swift_version }}

wasm-sdk-build:
name: Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
Expand Down Expand Up @@ -470,7 +469,7 @@ jobs:
uses: actions/checkout@v1
with:
repository: swiftlang/github-workflows
path: github-workflows
path: ${{ github.event.repository.name }}/github-workflows
ref: main
- name: Determine script-root path
id: script_path
Expand Down Expand Up @@ -510,8 +509,7 @@ jobs:
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
exit 1
fi
cat ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh | \
bash -s -- --wasm --flags="$BUILD_FLAGS" --build-command="${{ inputs.wasm_sdk_build_command }}" ${{ matrix.swift_version }}
${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh --wasm --flags="$BUILD_FLAGS" --build-command="${{ inputs.wasm_sdk_build_command }}" ${{ matrix.swift_version }}

embedded-wasm-sdk-build:
name: Embedded Swift SDK for Wasm Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
Expand Down Expand Up @@ -548,7 +546,7 @@ jobs:
uses: actions/checkout@v1
with:
repository: swiftlang/github-workflows
path: github-workflows
path: ${{ github.event.repository.name }}/github-workflows
ref: main
- name: Determine script-root path
id: script_path
Expand Down Expand Up @@ -588,8 +586,7 @@ jobs:
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
exit 1
fi
cat ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh | \
bash -s -- --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}

android-sdk-build:
name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - NDK ${{ matrix.ndk_version }})
Expand Down Expand Up @@ -627,7 +624,7 @@ jobs:
uses: actions/checkout@v1
with:
repository: swiftlang/github-workflows
path: github-workflows
path: ${{ github.event.repository.name }}/github-workflows
ref: main
- name: Determine script-root path
id: script_path
Expand Down Expand Up @@ -667,8 +664,7 @@ jobs:
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
exit 1
fi
cat ${{ steps.script_path.outputs.root }}/.github/workflows/scripts/install-and-build-with-sdk.sh | \
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 }}
${{ 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 }}

windows-build:
name: Windows (${{ matrix.swift_version }} - windows-2022)
Expand Down
Loading