Skip to content

Commit d7f56e8

Browse files
rnrornro
committed
test shim
1 parent 2bfa77c commit d7f56e8

File tree

11 files changed

+38
-38
lines changed

11 files changed

+38
-38
lines changed

‎.github/workflows/benchmarks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ jobs:
9797
exit 1
9898
fi
9999
100-
echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
100+
echo "benchmarks-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
101101
env:
102-
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash"
102+
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check_benchmark_thresholds.sh | BENCHMARK_PACKAGE_PATH=${{ inputs.benchmark_package_path }} bash"
103103
MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl libjemalloc-dev && git config --global --add safe.directory /$(basename ${{ github.workspace }})"
104104
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
105105
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
@@ -113,7 +113,7 @@ jobs:
113113
name: Benchmarks
114114
needs: construct-matrix
115115
# Workaround https://github.com/nektos/act/issues/1875
116-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
116+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
117117
with:
118118
name: "Benchmarks"
119119
matrix_string: '${{ needs.construct-matrix.outputs.benchmarks-matrix }}'

‎.github/workflows/cmake_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
which curl jq || apt -q update
4444
which curl || apt -yq install curl
4545
which jq || apt -yq install jq
46-
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash
46+
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/update-cmake-lists.sh | CONFIG_JSON='${{ inputs.update_cmake_lists_config }}' FAIL_ON_CHANGES=true bash
4747
- name: CMake build
4848
run: |
4949
which curl cmake ninja || apt -q update
5050
which curl || apt -yq install curl
5151
which cmake || apt -yq install cmake
5252
which ninja || apt -yq install ninja-build
53-
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash
53+
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/cmake-build.sh | TARGET_DIRECTORY="${{ inputs.cmake_build_target_directory }}" CMAKE_VERSION="${{ inputs.cmake_version }}" bash

‎.github/workflows/cxx_interop.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ jobs:
100100
exit 1
101101
fi
102102
103-
echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
103+
echo "cxx-interop-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
104104
env:
105-
MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
105+
MATRIX_LINUX_COMMAND: "curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check-cxx-interop-compatibility.sh | bash"
106106
MATRIX_LINUX_SETUP_COMMAND: "swift --version && apt-get update -y -q && apt-get install -y -q curl jq"
107107
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
108108
MATRIX_LINUX_5_10_ENABLED: ${{ inputs.linux_5_10_enabled }}
@@ -116,7 +116,7 @@ jobs:
116116
name: Cxx interop
117117
needs: construct-matrix
118118
# Workaround https://github.com/nektos/act/issues/1875
119-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
119+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
120120
with:
121121
name: "Cxx interop"
122122
matrix_string: '${{ needs.construct-matrix.outputs.cxx-interop-matrix }}'

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
unit-tests:
1414
name: Unit tests
1515
# Workaround https://github.com/nektos/act/issues/1875
16-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
16+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@skip_unsupported_swift_versions
1717
with:
1818
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1919
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
@@ -25,12 +25,12 @@ jobs:
2525
cxx-interop:
2626
name: Cxx interop
2727
# Workaround https://github.com/nektos/act/issues/1875
28-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
28+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@skip_unsupported_swift_versions
2929

3030
benchmarks:
3131
name: Benchmarks
3232
# Workaround https://github.com/nektos/act/issues/1875
33-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
33+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@skip_unsupported_swift_versions
3434
with:
3535
benchmark_package_path: "Benchmarks"
3636

@@ -45,7 +45,7 @@ jobs:
4545
with:
4646
persist-credentials: false
4747
- id: generate-matrix
48-
run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
48+
run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
4949
env:
5050
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq"
5151
MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
@@ -54,25 +54,25 @@ jobs:
5454
name: Integration tests
5555
needs: construct-integration-test-matrix
5656
# Workaround https://github.com/nektos/act/issues/1875
57-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
57+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
5858
with:
5959
name: "Integration tests"
6060
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
6161

6262
static-sdk:
6363
name: Static Linux Swift SDK
6464
# Workaround https://github.com/nektos/act/issues/1875
65-
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
65+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@skip_unsupported_swift_versions
6666

6767
wasm-sdk:
6868
name: WebAssembly Swift SDK
6969
# Workaround https://github.com/nektos/act/issues/1875
70-
uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main
70+
uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@skip_unsupported_swift_versions
7171

7272
macos-tests:
7373
name: macOS tests
7474
# Workaround https://github.com/nektos/act/issues/1875
75-
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
75+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@skip_unsupported_swift_versions
7676
with:
7777
runner_pool: nightly
7878
build_scheme: swift-nio-Package
@@ -86,4 +86,4 @@ jobs:
8686

8787
release-builds:
8888
name: Release builds
89-
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
89+
uses: apple/swift-nio/.github/workflows/release_builds.yml@skip_unsupported_swift_versions

‎.github/workflows/pull_request.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
unit-tests:
2020
name: Unit tests
2121
# Workaround https://github.com/nektos/act/issues/1875
22-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
22+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@skip_unsupported_swift_versions
2323
with:
2424
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2525
linux_6_0_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
@@ -31,14 +31,14 @@ jobs:
3131
benchmarks:
3232
name: Benchmarks
3333
# Workaround https://github.com/nektos/act/issues/1875
34-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
34+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@skip_unsupported_swift_versions
3535
with:
3636
benchmark_package_path: "Benchmarks"
3737

3838
cxx-interop:
3939
name: Cxx interop
4040
# Workaround https://github.com/nektos/act/issues/1875
41-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
41+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@skip_unsupported_swift_versions
4242

4343
construct-integration-test-matrix:
4444
name: Construct integration test matrix
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
persist-credentials: false
5353
- id: generate-matrix
54-
run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
54+
run: echo "integration-test-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
5555
env:
5656
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq"
5757
MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
@@ -60,7 +60,7 @@ jobs:
6060
name: Integration tests
6161
needs: construct-integration-test-matrix
6262
# Workaround https://github.com/nektos/act/issues/1875
63-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
63+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
6464
with:
6565
name: "Integration tests"
6666
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
@@ -86,7 +86,7 @@ jobs:
8686
macos-tests:
8787
name: macOS tests
8888
# Workaround https://github.com/nektos/act/issues/1875
89-
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
89+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@skip_unsupported_swift_versions
9090
with:
9191
runner_pool: general
9292
build_scheme: swift-nio-Package
@@ -96,13 +96,13 @@ jobs:
9696
static-sdk:
9797
name: Static Linux Swift SDK
9898
# Workaround https://github.com/nektos/act/issues/1875
99-
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
99+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@skip_unsupported_swift_versions
100100

101101
wasm-sdk:
102102
name: WebAssembly Swift SDK
103103
# Workaround https://github.com/nektos/act/issues/1875
104-
uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@main
104+
uses: apple/swift-nio/.github/workflows/wasm_sdk.yml@skip_unsupported_swift_versions
105105

106106
release-builds:
107107
name: Release builds
108-
uses: apple/swift-nio/.github/workflows/release_builds.yml@main
108+
uses: apple/swift-nio/.github/workflows/release_builds.yml@skip_unsupported_swift_versions

‎.github/workflows/release_builds.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
exit 1
133133
fi
134134
135-
echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
135+
echo "release-build-matrix=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/generate_matrix.sh | MATRIX_LINUX_ENV_VARS_JSON="${linux_env_vars_json}" MATRIX_WINDOWS_ENV_VARS_JSON="${windows_env_vars_json}" bash)" >> "$GITHUB_OUTPUT"
136136
env:
137137
MATRIX_LINUX_SETUP_COMMAND: "swift --version"
138138
MATRIX_LINUX_COMMAND: "swift build -c release"
@@ -164,7 +164,7 @@ jobs:
164164
name: Release builds
165165
needs: construct-matrix
166166
# Workaround https://github.com/nektos/act/issues/1875
167-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
167+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
168168
with:
169169
name: "Release builds"
170170
matrix_string: '${{ needs.construct-matrix.outputs.release-build-matrix }}'

‎.github/workflows/static_sdk.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
"platform":"Linux",
4848
"runner":"ubuntu-latest",
4949
"image":"ubuntu:jammy",
50-
"setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_static_sdk.sh | INSTALL_SWIFT_STATIC_SDK_VERSION=latest INSTALL_SWIFT_STATIC_SDK_ARCH=x86_64 bash && hash -r",
50+
"setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/install_static_sdk.sh | INSTALL_SWIFT_STATIC_SDK_VERSION=latest INSTALL_SWIFT_STATIC_SDK_ARCH=x86_64 bash && hash -r",
5151
"command":"swift build",
5252
"command_arguments":"${{ inputs.command_arguments }}",
5353
"env":'"$env_vars_json"'
@@ -58,7 +58,7 @@ jobs:
5858
"platform":"Linux",
5959
"runner":"ubuntu-latest",
6060
"image":"ubuntu:jammy",
61-
"setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/install_static_sdk.sh | INSTALL_SWIFT_STATIC_SDK_BRANCH=main INSTALL_SWIFT_STATIC_SDK_ARCH=x86_64 bash && hash -r",
61+
"setup_command":"apt update -q && apt install -y -q curl jq tar && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/install_swift_prerequisites.sh | bash && curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/install_static_sdk.sh | INSTALL_SWIFT_STATIC_SDK_BRANCH=main INSTALL_SWIFT_STATIC_SDK_ARCH=x86_64 bash && hash -r",
6262
"command":"swift build",
6363
"command_arguments":"${{ inputs.command_arguments }}",
6464
"env":'"$env_vars_json"'
@@ -71,7 +71,7 @@ jobs:
7171
name: Static SDK
7272
needs: construct-matrix
7373
# Workaround https://github.com/nektos/act/issues/1875
74-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
74+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
7575
with:
7676
name: "Static SDK"
7777
matrix_string: '${{ needs.construct-matrix.outputs.static-sdk-matrix }}'

‎.github/workflows/swift_load_test_matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
name: Execute matrix
3939
needs: load-matrix
4040
# Workaround https://github.com/nektos/act/issues/1875
41-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
41+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@skip_unsupported_swift_versions
4242
with:
4343
name: ${{ inputs.name }}
4444
matrix_string: '${{ needs.load-matrix.outputs.swift-matrix }}'

‎.github/workflows/swift_matrix.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
COMMAND_OVERRIDE_NIGHTLY_MAIN: ${{ inputs.matrix_linux_nightly_main_command_override }}
169169
run: |
170170
apt-get -qq update && apt-get -qq -y install curl
171-
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.sh | bash
171+
curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check-matrix-job.sh | bash
172172
173173
windows:
174174
name: Windows (${{ matrix.swift.swift_version }})
@@ -192,7 +192,7 @@ jobs:
192192
persist-credentials: false
193193
- name: Donwload matrix script
194194
if: ${{ matrix.swift.enabled }}
195-
run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1
195+
run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1
196196
- name: Run matrix job
197197
if: ${{ matrix.swift.enabled }}
198198
run: |
@@ -224,7 +224,7 @@ jobs:
224224
submodules: true
225225
- name: Donwload matrix script
226226
if: ${{ matrix.swift.enabled }}
227-
run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1
227+
run: curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check-matrix-job.ps1 -o __check-matrix-job.ps1
228228
- name: Run matrix job
229229
if: ${{ matrix.swift.enabled }}
230230
run: |

‎.github/workflows/swift_test_matrix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Check Swift version compatibility
3737
id: version_check
3838
run: |
39-
output=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-swift-version-compatibility.sh | SWIFT_VERSION="${{ matrix.config.swift_version }}" bash)
39+
output=$(curl -s --retry 3 https://raw.githubusercontent.com/apple/swift-nio/skip_unsupported_swift_versions/scripts/check-swift-version-compatibility.sh | SWIFT_VERSION="${{ matrix.config.swift_version }}" bash)
4040
echo "$output"
4141
supported=$(echo "$output" | grep "swift_version_supported=" | cut -d= -f2)
4242
echo "should_run=$supported" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)