Skip to content

Commit 9f14763

Browse files
rnrornro
committed
test shim
1 parent d4baf5e commit 9f14763

7 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/benchmarks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
persist-credentials: false
7474
- id: generate-matrix
75-
run: echo "benchmarks-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
75+
run: echo "benchmarks-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/swift_6_1_workflows/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
7676
env:
7777
MATRIX_LINUX_COMMAND: "swift package --package-path ${{ inputs.benchmark_package_path }} ${{ inputs.swift_package_arguments }} benchmark baseline check --check-absolute-path ${{ inputs.benchmark_package_path }}/Thresholds/${SWIFT_VERSION}/"
7878
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q libjemalloc-dev"
@@ -87,7 +87,7 @@ jobs:
8787
name: Benchmarks
8888
needs: construct-matrix
8989
# Workaround https://github.com/nektos/act/issues/1875
90-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
90+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
9191
with:
9292
name: "Benchmarks"
9393
matrix_string: '${{ needs.construct-matrix.outputs.benchmarks-matrix }}'

‎.github/workflows/cxx_interop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
with:
6666
persist-credentials: false
6767
- id: generate-matrix
68-
run: echo "cxx-interop-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
68+
run: echo "cxx-interop-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/swift_6_1_workflows/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
6969
env:
7070
MATRIX_LINUX_COMMAND: "curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/check-cxx-interop-compatibility.sh | bash"
7171
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q curl jq"
@@ -80,7 +80,7 @@ jobs:
8080
name: Cxx interop
8181
needs: construct-matrix
8282
# Workaround https://github.com/nektos/act/issues/1875
83-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
83+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
8484
with:
8585
name: "Cxx interop"
8686
matrix_string: '${{ needs.construct-matrix.outputs.cxx-interop-matrix }}'

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
unit-tests:
1111
name: Unit tests
1212
# Workaround https://github.com/nektos/act/issues/1875
13-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
13+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@swift_6_1_workflows
1414
with:
1515
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
1616
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
@@ -22,12 +22,12 @@ jobs:
2222
cxx-interop:
2323
name: Cxx interop
2424
# Workaround https://github.com/nektos/act/issues/1875
25-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
25+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@swift_6_1_workflows
2626

2727
benchmarks:
2828
name: Benchmarks
2929
# Workaround https://github.com/nektos/act/issues/1875
30-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
30+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@swift_6_1_workflows
3131
with:
3232
benchmark_package_path: "Benchmarks"
3333

@@ -42,7 +42,7 @@ jobs:
4242
with:
4343
persist-credentials: false
4444
- id: generate-matrix
45-
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
45+
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/swift_6_1_workflows/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
4646
env:
4747
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq"
4848
MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
@@ -51,20 +51,20 @@ jobs:
5151
name: Integration tests
5252
needs: construct-integration-test-matrix
5353
# Workaround https://github.com/nektos/act/issues/1875
54-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
54+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
5555
with:
5656
name: "Integration tests"
5757
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
5858

5959
static-sdk:
6060
name: Static SDK
6161
# Workaround https://github.com/nektos/act/issues/1875
62-
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
62+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@swift_6_1_workflows
6363

6464
macos-tests:
6565
name: macOS tests
6666
# Workaround https://github.com/nektos/act/issues/1875
67-
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
67+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@swift_6_1_workflows
6868
with:
6969
runner_pool: nightly
7070
build_scheme: swift-nio-Package

‎.github/workflows/pull_request.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
unit-tests:
1515
name: Unit tests
1616
# Workaround https://github.com/nektos/act/issues/1875
17-
uses: apple/swift-nio/.github/workflows/unit_tests.yml@main
17+
uses: apple/swift-nio/.github/workflows/unit_tests.yml@swift_6_1_workflows
1818
with:
1919
linux_5_9_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
2020
linux_5_10_arguments_override: "-Xswiftc -warnings-as-errors --explicit-target-dependency-import-check error"
@@ -26,14 +26,14 @@ jobs:
2626
benchmarks:
2727
name: Benchmarks
2828
# Workaround https://github.com/nektos/act/issues/1875
29-
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
29+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@swift_6_1_workflows
3030
with:
3131
benchmark_package_path: "Benchmarks"
3232

3333
cxx-interop:
3434
name: Cxx interop
3535
# Workaround https://github.com/nektos/act/issues/1875
36-
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
36+
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@swift_6_1_workflows
3737

3838
construct-integration-test-matrix:
3939
name: Construct integration test matrix
@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
persist-credentials: false
4848
- id: generate-matrix
49-
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
49+
run: echo "integration-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/swift_6_1_workflows/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
5050
env:
5151
MATRIX_LINUX_SETUP_COMMAND: "apt-get update -y -q && apt-get install -y -q lsof dnsutils netcat-openbsd net-tools curl jq"
5252
MATRIX_LINUX_COMMAND: "./scripts/integration_tests.sh"
@@ -55,7 +55,7 @@ jobs:
5555
name: Integration tests
5656
needs: construct-integration-test-matrix
5757
# Workaround https://github.com/nektos/act/issues/1875
58-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
58+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
5959
with:
6060
name: "Integration tests"
6161
matrix_string: '${{ needs.construct-integration-test-matrix.outputs.integration-test-matrix }}'
@@ -81,12 +81,12 @@ jobs:
8181
macos-tests:
8282
name: macOS tests
8383
# Workaround https://github.com/nektos/act/issues/1875
84-
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
84+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@swift_6_1_workflows
8585
with:
8686
runner_pool: general
8787
build_scheme: swift-nio-Package
8888

8989
static-sdk:
9090
name: Static SDK
9191
# Workaround https://github.com/nektos/act/issues/1875
92-
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
92+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@swift_6_1_workflows

‎.github/workflows/static_sdk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
static-sdk:
88
name: Static SDK
99
# Workaround https://github.com/nektos/act/issues/1875
10-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
10+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
1111
with:
1212
name: "Static SDK"
1313
matrix_string: >-

‎.github/workflows/swift_load_test_matrix.yml‎

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

‎.github/workflows/unit_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
with:
130130
persist-credentials: false
131131
- id: generate-matrix
132-
run: echo "unit-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/main/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
132+
run: echo "unit-test-matrix=$(curl -s https://raw.githubusercontent.com/apple/swift-nio/swift_6_1_workflows/scripts/generate_matrix.sh | bash)" >> "$GITHUB_OUTPUT"
133133
env:
134134
MATRIX_LINUX_COMMAND: "swift test"
135135
MATRIX_LINUX_5_9_ENABLED: ${{ inputs.linux_5_9_enabled }}
@@ -158,7 +158,7 @@ jobs:
158158
name: Unit tests
159159
needs: construct-matrix
160160
# Workaround https://github.com/nektos/act/issues/1875
161-
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@main
161+
uses: apple/swift-nio/.github/workflows/swift_test_matrix.yml@swift_6_1_workflows
162162
with:
163163
name: "Unit tests"
164164
matrix_string: '${{ needs.construct-matrix.outputs.unit-test-matrix }}'

0 commit comments

Comments
 (0)