Skip to content

Commit 0cc0044

Browse files
kateinoigakukunkateinoigakukun
committed
Remove toolchain build from the CI matrix
swiftwasm/swift#5604
1 parent 2e79f72 commit 0cc0044

File tree

2 files changed

+0
-147
lines changed

2 files changed

+0
-147
lines changed

‎.github/scripts/build-matrix.rb

-98
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,6 @@
22
require "optparse"
33

44
BASE_MATRIX_ENTRIES = [
5-
{
6-
"build_os": "ubuntu-20.04",
7-
"agent_query": "ubuntu-20.04",
8-
"target": "ubuntu20.04_x86_64",
9-
"containers": {
10-
"main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
11-
"release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:9007661fb6d57ebef902618e831458e88068350b0ecc8d85e56441d25a9f4312",
12-
"release-6.1": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:9007661fb6d57ebef902618e831458e88068350b0ecc8d85e56441d25a9f4312",
13-
},
14-
"run_stdlib_test": true,
15-
"run_full_test": false,
16-
"run_e2e_test": true,
17-
"build_hello_wasm": true,
18-
"clean_build_dir": false,
19-
"free_disk_space": true,
20-
"only_swift_sdk": false,
21-
},
22-
{
23-
"build_os": "ubuntu-22.04",
24-
"agent_query": "ubuntu-22.04",
25-
"target": "ubuntu22.04_x86_64",
26-
"containers": {
27-
"main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-22.04",
28-
"release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:8060adba9c044b1fc751b9671167320c9cc0094d0a45d7b8fedb707c49b764c2",
29-
"release-6.1": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:8060adba9c044b1fc751b9671167320c9cc0094d0a45d7b8fedb707c49b764c2",
30-
},
31-
"run_stdlib_test": true,
32-
"run_full_test": false,
33-
"run_e2e_test": true,
34-
"build_hello_wasm": true,
35-
"clean_build_dir": false,
36-
"free_disk_space": true,
37-
"only_swift_sdk": false,
38-
},
39-
{
40-
"build_os": "amazon-linux-2",
41-
"agent_query": "ubuntu-22.04",
42-
"target": "amazonlinux2_x86_64",
43-
"containers": {
44-
"main": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2",
45-
"release-6.0": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:fc95912c595faecacbb869635fa871f8f31b8d6ed2f0df6792b53628db7ada94",
46-
"release-6.1": "ghcr.io/swiftwasm/swift-ci:main-amazon-linux-2@sha256:fc95912c595faecacbb869635fa871f8f31b8d6ed2f0df6792b53628db7ada94",
47-
},
48-
"run_stdlib_test": false,
49-
"run_full_test": false,
50-
"run_e2e_test": false,
51-
"build_hello_wasm": true,
52-
"clean_build_dir": false,
53-
"free_disk_space": true,
54-
"only_swift_sdk": false,
55-
},
56-
{
57-
"build_os": "macos-13",
58-
"agent_query": "macos-13",
59-
"schemes": ["release-6.0", "release-6.1", "main"],
60-
"target": "macos_x86_64",
61-
"run_stdlib_test": false,
62-
"run_full_test": false,
63-
"run_e2e_test": false,
64-
"build_hello_wasm": false,
65-
"clean_build_dir": false,
66-
"only_swift_sdk": false,
67-
},
68-
{
69-
"build_os": "macos-14",
70-
"agent_query": "macos-14",
71-
"schemes": ["release-6.0", "release-6.1", "main"],
72-
"target": "macos_arm64",
73-
"run_stdlib_test": true,
74-
"run_full_test": false,
75-
"run_e2e_test": true,
76-
"build_hello_wasm": true,
77-
"clean_build_dir": true,
78-
"free_disk_space": true,
79-
"only_swift_sdk": false,
80-
},
815
# Generic Swift SDK build
826
{
837
"job_name": "Swift SDK",
@@ -147,28 +71,6 @@ def main
14771
end.parse!
14872

14973
matrix_entries = BASE_MATRIX_ENTRIES.dup
150-
if options[:runner]
151-
runner = JSON.parse(File.read(options[:runner]))
152-
if label = runner["outputs"]["ubuntu20_04_aarch64-label"]
153-
matrix_entries << {
154-
"build_os": "ubuntu-20.04",
155-
"agent_query": label,
156-
"target": "ubuntu20.04_aarch64",
157-
"containers": {
158-
"main": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04",
159-
"release-6.0": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:2a977060476a0f6f702d59ed0cd4e8506c7c1f1ed48d85a1a684d2d3fb62c297",
160-
"release-6.1": "ghcr.io/swiftwasm/swift-ci:main-ubuntu-20.04@sha256:2a977060476a0f6f702d59ed0cd4e8506c7c1f1ed48d85a1a684d2d3fb62c297",
161-
},
162-
"run_stdlib_test": false,
163-
"run_full_test": false,
164-
"run_e2e_test": false,
165-
"build_hello_wasm": true,
166-
"clean_build_dir": false,
167-
"free_disk_space": false,
168-
"only_swift_sdk": false,
169-
}
170-
end
171-
end
17274

17375
schemes = derive_schemes(options)
17476
schemes = schemes

‎.github/workflows/build-toolchain.yml

-49
Original file line numberDiff line numberDiff line change
@@ -19,57 +19,8 @@ on:
1919
default: 'main'
2020

2121
jobs:
22-
start-runner:
23-
name: Start self-hosted EC2 runner
24-
runs-on: ubuntu-latest
25-
# Run only on main branches to avoid triggers by non-collaborator
26-
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'check-self-hosted-ci') }}
27-
outputs:
28-
ubuntu20_04_aarch64-label: ${{ steps.start-ubuntu20_04_aarch64-runner.outputs.label }}
29-
ubuntu20_04_aarch64-ec2-instance-id: ${{ steps.start-ubuntu20_04_aarch64-runner.outputs.ec2-instance-id }}
30-
steps:
31-
- name: Configure AWS credentials
32-
uses: aws-actions/configure-aws-credentials@v4
33-
with:
34-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
35-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
36-
aws-region: ${{ secrets.AWS_REGION }}
37-
- name: Start EC2 runner (ubuntu20_04_aarch64)
38-
id: start-ubuntu20_04_aarch64-runner
39-
uses: machulav/ec2-github-runner@v2
40-
with:
41-
mode: start
42-
github-token: ${{ secrets.SWIFTWASM_BUILDBOT_TOKEN }}
43-
ec2-image-id: ami-03803f6b50b56647a # swiftwasm-ci/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20221201
44-
ec2-instance-type: c6g.xlarge
45-
subnet-id: subnet-327f4a13
46-
security-group-id: sg-0429f5ec2bee9dc0c
47-
stop-runner:
48-
name: Stop self-hosted EC2 runner
49-
needs: [start-runner, build-toolchain]
50-
runs-on: ubuntu-latest
51-
# Required to stop the runner even if the error happened in the previous jobs
52-
if: ${{ always() && needs.start-runner.result == 'success' }}
53-
# The runner can be already stopped when re-running a part of failed jobs
54-
continue-on-error: true
55-
steps:
56-
- name: Configure AWS credentials
57-
uses: aws-actions/configure-aws-credentials@v4
58-
with:
59-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
60-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
61-
aws-region: ${{ secrets.AWS_REGION }}
62-
- name: Stop EC2 runner (ubuntu20_04_aarch64)
63-
uses: machulav/ec2-github-runner@v2
64-
with:
65-
mode: stop
66-
github-token: ${{ secrets.SWIFTWASM_BUILDBOT_TOKEN }}
67-
label: ${{ needs.start-runner.outputs.ubuntu20_04_aarch64-label }}
68-
ec2-instance-id: ${{ needs.start-runner.outputs.ubuntu20_04_aarch64-ec2-instance-id }}
69-
7022
build-matrix:
7123
name: Build matrix
72-
needs: [start-runner]
7324
runs-on: ubuntu-latest
7425
if: ${{ !cancelled() }}
7526
outputs:

0 commit comments

Comments
 (0)