Skip to content

Commit e75b0ea

Browse files
authored
Merge pull request #1022 from AkihiroSuda/dev
CI: update macOS to 12, Ubuntu to 22.04
2 parents 4edd353 + ad9ee76 commit e75b0ea

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
artifacts-darwin:
1414
name: Artifacts Darwin
15-
runs-on: macos-11
15+
runs-on: macos-12
1616
timeout-minutes: 20
1717
steps:
1818
- uses: actions/setup-go@v3
@@ -29,7 +29,7 @@ jobs:
2929
name: artifacts-darwin
3030
path: _artifacts/
3131
release:
32-
runs-on: ubuntu-20.04
32+
runs-on: ubuntu-22.04
3333
needs: artifacts-darwin
3434
timeout-minutes: 20
3535
steps:

.github/workflows/test.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
basic:
1212
name: "Lints & Unit tests"
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
timeout-minutes: 30
1515
steps:
1616
- uses: actions/setup-go@v3
@@ -53,7 +53,7 @@ jobs:
5353

5454
cross-windows:
5555
name: "Windows tests (cross)"
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-22.04
5757
timeout-minutes: 30
5858
steps:
5959
- uses: actions/setup-go@v3
@@ -74,7 +74,7 @@ jobs:
7474

7575
integration:
7676
name: Integration tests
77-
runs-on: macos-11
77+
runs-on: macos-12
7878
timeout-minutes: 120
7979
steps:
8080
- uses: actions/setup-go@v3
@@ -83,6 +83,8 @@ jobs:
8383
- uses: actions/checkout@v3
8484
with:
8585
fetch-depth: 1
86+
- name: Test making darwin artifacts
87+
run: make artifacts-darwin
8688
- name: Unit tests
8789
run: go test -v ./...
8890
- name: Make
@@ -157,7 +159,7 @@ jobs:
157159

158160
upgrade:
159161
name: "Upgrade test"
160-
runs-on: macos-11
162+
runs-on: macos-12
161163
timeout-minutes: 120
162164
strategy:
163165
matrix:
@@ -184,23 +186,9 @@ jobs:
184186
max_attempts: 3
185187
command: ./hack/test-upgrade.sh ${{ matrix.oldver }} ${{ github.sha }}
186188

187-
artifacts-darwin:
188-
name: Artifacts Darwin
189-
runs-on: macos-11
190-
timeout-minutes: 20
191-
steps:
192-
- uses: actions/setup-go@v3
193-
with:
194-
go-version: 1.19.x
195-
- uses: actions/checkout@v3
196-
with:
197-
fetch-depth: 1
198-
- name: Make darwin artifacts
199-
run: make artifacts-darwin
200-
201189
artifacts-linux:
202190
name: Artifacts Linux
203-
runs-on: ubuntu-20.04
191+
runs-on: ubuntu-22.04
204192
timeout-minutes: 20
205193
steps:
206194
- uses: actions/setup-go@v3

0 commit comments

Comments
 (0)