Skip to content

Commit a4b8ad7

Browse files
ci: use ubuntu-latest-m runner [backport: release/v0.52] (#6933)
Co-authored-by: DmitriyLewen <[email protected]>
1 parent 2b711bc commit a4b8ad7

File tree

3 files changed

+11
-58
lines changed

3 files changed

+11
-58
lines changed

.github/workflows/bypass-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
runs-on: ${{ matrix.operating-system }}
2121
strategy:
2222
matrix:
23-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
23+
operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
2424
steps:
2525
- run: 'echo "No test required"'
2626

2727
integration:
2828
name: Integration Test
29-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-latest-m
3030
steps:
3131
- run: 'echo "No test required"'

.github/workflows/reusable-release.yaml

+1-10
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,14 @@ env:
1919
jobs:
2020
release:
2121
name: Release
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-latest-m
2323
env:
2424
DOCKER_CLI_EXPERIMENTAL: "enabled"
2525
permissions:
2626
id-token: write # For cosign
2727
packages: write # For GHCR
2828
contents: read # Not required for public repositories, but for clarity
2929
steps:
30-
- name: Maximize build space
31-
uses: easimon/maximize-build-space@v10
32-
with:
33-
root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space.
34-
remove-android: 'true'
35-
remove-docker-images: 'true'
36-
remove-dotnet: 'true'
37-
remove-haskell: 'true'
38-
3930
- name: Cosign install
4031
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20
4132

.github/workflows/test.yaml

+8-46
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,8 @@ jobs:
1515
runs-on: ${{ matrix.operating-system }}
1616
strategy:
1717
matrix:
18-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
18+
operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
1919
steps:
20-
- name: Maximize build space
21-
uses: easimon/maximize-build-space@v10
22-
with:
23-
root-reserve-mb: 32768 # The golangci-lint uses a lot of space.
24-
remove-android: "true"
25-
remove-docker-images: "true"
26-
remove-dotnet: "true"
27-
remove-haskell: "true"
28-
if: matrix.operating-system == 'ubuntu-latest'
29-
3020
- uses: actions/[email protected]
3121

3222
- name: Set up Go
@@ -40,15 +30,15 @@ jobs:
4030
echo "Run 'go mod tidy' and push it"
4131
exit 1
4232
fi
43-
if: matrix.operating-system == 'ubuntu-latest'
33+
if: matrix.operating-system == 'ubuntu-latest-m'
4434

4535
- name: Lint
4636
id: lint
4737
uses: golangci/[email protected]
4838
with:
4939
version: v1.58
5040
args: --verbose --out-format=line-number
51-
if: matrix.operating-system == 'ubuntu-latest'
41+
if: matrix.operating-system == 'ubuntu-latest-m'
5242

5343
- name: Check if linter failed
5444
run: |
@@ -69,14 +59,14 @@ jobs:
6959
echo "Run 'mage docs:generate' and push it"
7060
exit 1
7161
fi
72-
if: matrix.operating-system == 'ubuntu-latest'
62+
if: matrix.operating-system == 'ubuntu-latest-m'
7363

7464
- name: Run unit tests
7565
run: mage test:unit
7666

7767
integration:
7868
name: Integration Test
79-
runs-on: ubuntu-latest
69+
runs-on: ubuntu-latest-m
8070
steps:
8171
- name: Check out code into the Go module directory
8272
uses: actions/[email protected]
@@ -96,17 +86,8 @@ jobs:
9686

9787
k8s-integration:
9888
name: K8s Integration Test
99-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-latest-m
10090
steps:
101-
- name: Maximize build space
102-
uses: easimon/maximize-build-space@v10
103-
with:
104-
root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space.
105-
remove-android: "true"
106-
remove-docker-images: "true"
107-
remove-dotnet: "true"
108-
remove-haskell: "true"
109-
11091
- name: Check out code into the Go module directory
11192
uses: actions/[email protected]
11293

@@ -147,17 +128,8 @@ jobs:
147128
148129
vm-test:
149130
name: VM Integration Test
150-
runs-on: ubuntu-latest
131+
runs-on: ubuntu-latest-m
151132
steps:
152-
- name: Maximize build space
153-
uses: easimon/maximize-build-space@v10
154-
with:
155-
root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space.
156-
remove-android: 'true'
157-
remove-docker-images: 'true'
158-
remove-dotnet: 'true'
159-
remove-haskell: 'true'
160-
161133
- name: Checkout
162134
uses: actions/[email protected]
163135

@@ -178,20 +150,10 @@ jobs:
178150
runs-on: ${{ matrix.operating-system }}
179151
strategy:
180152
matrix:
181-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
153+
operating-system: [ubuntu-latest-m, windows-latest, macos-latest]
182154
env:
183155
DOCKER_CLI_EXPERIMENTAL: "enabled"
184156
steps:
185-
- name: Maximize build space
186-
uses: easimon/maximize-build-space@v10
187-
with:
188-
root-reserve-mb: 32768 # The Go cache (`~/.cache/go-build` and `~/go/pkg`) requires a lot of storage space.
189-
remove-android: 'true'
190-
remove-docker-images: 'true'
191-
remove-dotnet: 'true'
192-
remove-haskell: 'true'
193-
if: matrix.operating-system == 'ubuntu-latest'
194-
195157
- name: Checkout
196158
uses: actions/[email protected]
197159

0 commit comments

Comments
 (0)