Skip to content

Commit 5fc148c

Browse files
coderbirjucoderbirju
committed
clean up build.yml
Signed-off-by: Arjun Raja Yogidas <[email protected]>
1 parent 7de207d commit 5fc148c

File tree

1 file changed

+93
-37
lines changed

1 file changed

+93
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 93 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -23,62 +23,101 @@ env:
2323
GO_VERSION: '1.21.10'
2424

2525
jobs:
26-
test-on-codebuild:
27-
if: github.repository == 'awslabs/soci-snapshotter'
28-
runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
26+
setup:
27+
# This job sets up the runners to be used in the matrix for the build workflow.
28+
# It provides a list of available runners with stable, human-friendly names and a mapping
29+
# from those names to the actual `runs-on` value for each runner type. This allows us to
30+
# use codebuild-hosted runners for awslabs/soci-snapshotter without requiring forks to also
31+
# have codebuild-hosted runners.
32+
#
33+
# If you want to use codebuild runners for your personal fork, follow the instructions to set
34+
# up a codebuild project. https://docs.aws.amazon.com/codebuild/latest/userguide/action-runner.html
35+
# Then, replace 'soci-snapshotter-instance' with the name of the project you created.
36+
name: Setup Build Matrix
37+
runs-on: ubuntu-latest
38+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'awslabs/soci-snapshotter'
2939
strategy:
3040
matrix:
31-
os: [arm-3.0-large]
32-
timeout-minutes: 15
41+
# We're using a matrix with a single entry so that we can define some config as YAML rather than
42+
# having to write escaped json in a string.
43+
include:
44+
- use-codebuild: ${{ github.repository_owner == 'coderbirju' }}
45+
runs-on-names-cb: [ ubuntu-x86, al2-arm ]
46+
runs-on-names: [ ubuntu ]
47+
runner-labels:
48+
ubuntu: ubuntu-22.04
49+
ubuntu-x86: "codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge"
50+
al2-arm: "codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large"
51+
outputs:
52+
available-runners: ${{ matrix.use-codebuild && toJSON(matrix.runs-on-names-cb) || toJSON(matrix.runs-on-names) }}
53+
runner-labels: ${{ toJSON(matrix.runner-labels) }}
3354
steps:
34-
- uses: actions/checkout@v4
35-
- uses: actions/setup-go@v5
36-
with:
37-
go-version: ${{ env.GO_VERSION }}
38-
- run: make
39-
- run: make test
55+
- name: Dump Config
56+
run: echo '${{ toJSON(matrix) }}'
4057

41-
test-on-fork:
42-
if: github.repository != 'awslabs/soci-snapshotter'
43-
runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
58+
59+
test:
60+
needs: setup
61+
runs-on: ${{ fromJSON(needs.setup.outputs.runner-labels)[matrix.os] }}
4462
strategy:
4563
matrix:
46-
os: [arm-3.0-large]
64+
os: ${{ fromJSON(needs.setup.outputs.available-runners) }}
4765
timeout-minutes: 15
4866
steps:
4967
- uses: actions/checkout@v4
5068
- uses: actions/setup-go@v5
5169
with:
5270
go-version: ${{ env.GO_VERSION }}
53-
- run: dnf list --installed
54-
- run: dnf install zlib-static.aarch64 -y
71+
- name: Install zlib static on AL2
72+
if: matrix.os == 'al2-arm'
73+
run: dnf install zlib-static.aarch64 -y
5574
- run: make
5675
- run: make test
5776

58-
integration-on-codebuild:
59-
if: github.repository == 'awslabs/soci-snapshotter'
60-
runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
61-
timeout-minutes: 40
62-
strategy:
63-
fail-fast: false
64-
matrix:
65-
containerd: ["1.6.30", "1.7.14"]
66-
env:
67-
DOCKER_BUILD_ARGS: "CONTAINERD_VERSION=${{ matrix.containerd }}"
68-
steps:
69-
- uses: actions/checkout@v4
70-
- uses: actions/setup-go@v5
71-
with:
72-
go-version: ${{ env.GO_VERSION }}
73-
- run: make integration
7477

75-
integration-on-fork:
76-
if: github.repository != 'awslabs/soci-snapshotter'
77-
runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
78+
# test-on-codebuild:
79+
# if: github.repository == 'awslabs/soci-snapshotter'
80+
# runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
81+
# strategy:
82+
# matrix:
83+
# os: [arm-3.0-large, ubuntu-7.0-xlarge]
84+
# timeout-minutes: 15
85+
# steps:
86+
# - uses: actions/checkout@v4
87+
# - uses: actions/setup-go@v5
88+
# with:
89+
# go-version: ${{ env.GO_VERSION }}
90+
# - name: Install zlib static on AL2
91+
# if: matrix.os == 'arm-3.0-large'
92+
# run: dnf install zlib-static.aarch64 -y
93+
# - run: make
94+
# - run: make test
95+
96+
# test-on-fork:
97+
# if: github.repository != 'awslabs/soci-snapshotter'
98+
# runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-${{ matrix.os }}
99+
# strategy:
100+
# matrix:
101+
# os: [arm-3.0-large]
102+
# timeout-minutes: 15
103+
# steps:
104+
# - uses: actions/checkout@v4
105+
# - uses: actions/setup-go@v5
106+
# with:
107+
# go-version: ${{ env.GO_VERSION }}
108+
# - name: Install zlib static on AL2
109+
# if: matrix.os == 'arm-3.0-large'
110+
# run: dnf install zlib-static.aarch64 -y
111+
# - run: make
112+
# - run: make test
113+
114+
integration:
115+
needs: setup
116+
runs-on: ${{ fromJSON(needs.setup.outputs.runner-labels)[matrix.os] }}
78117
timeout-minutes: 40
79118
strategy:
80-
fail-fast: false
81119
matrix:
120+
os: ${{ fromJSON(needs.setup.outputs.available-runners) }}
82121
containerd: ["1.6.30", "1.7.14"]
83122
env:
84123
DOCKER_BUILD_ARGS: "CONTAINERD_VERSION=${{ matrix.containerd }}"
@@ -88,3 +127,20 @@ jobs:
88127
with:
89128
go-version: ${{ env.GO_VERSION }}
90129
- run: make integration
130+
131+
# integration-on-fork:
132+
# if: github.repository != 'awslabs/soci-snapshotter'
133+
# runs-on: codebuild-soci-snapshotter-instance-dev-new-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge
134+
# timeout-minutes: 40
135+
# strategy:
136+
# fail-fast: false
137+
# matrix:
138+
# containerd: ["1.6.30", "1.7.14"]
139+
# env:
140+
# DOCKER_BUILD_ARGS: "CONTAINERD_VERSION=${{ matrix.containerd }}"
141+
# steps:
142+
# - uses: actions/checkout@v4
143+
# - uses: actions/setup-go@v5
144+
# with:
145+
# go-version: ${{ env.GO_VERSION }}
146+
# - run: make integration

0 commit comments

Comments
 (0)