Skip to content

Commit 9ff5b61

Browse files
authored
Merge pull request #276 from crazy-max/ci-bump-os
ci: bump runners to ubuntu-22.04
2 parents 4ede49c + 62d8c84 commit 9ff5b61

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
jobs:
2121
validate:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
strategy:
2424
fail-fast: false
2525
matrix:
@@ -44,6 +44,7 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
os:
47+
- ubuntu-22.04
4748
- ubuntu-20.04
4849
- macOS-11
4950
- windows-2022
@@ -59,13 +60,13 @@ jobs:
5960
cache: true
6061
-
6162
name: Install deps
62-
if: ${{ matrix.os == 'ubuntu-20.04' }}
63+
if: startsWith(matrix.os, 'ubuntu-')
6364
run: |
6465
sudo apt-get update
6566
sudo apt-get install -y dbus-x11 gnome-keyring libsecret-1-dev pass
6667
-
6768
name: GPG conf
68-
if: ${{ matrix.os == 'ubuntu-20.04' }}
69+
if: startsWith(matrix.os, 'ubuntu-')
6970
uses: actions/github-script@v6
7071
id: gpg
7172
with:
@@ -82,15 +83,15 @@ jobs:
8283
core.setOutput('passphrase', fs.readFileSync('.github/workflows/fixtures/7D851EB72D73BDA0.pass', {encoding: 'utf8'}));
8384
-
8485
name: Import GPG key
85-
if: ${{ matrix.os == 'ubuntu-20.04' }}
86+
if: startsWith(matrix.os, 'ubuntu-')
8687
uses: crazy-max/ghaction-import-gpg@v5
8788
with:
8889
gpg_private_key: ${{ steps.gpg.outputs.key }}
8990
passphrase: ${{ steps.gpg.outputs.passphrase }}
9091
-
9192
name: Test
9293
run: |
93-
if [ "${{ matrix.os }}" = "ubuntu-20.04" ]; then
94+
if [[ "${{ matrix.os }}" = ubuntu-* ]]; then
9495
echo -e "trust\n5\ny" | gpg --batch --no-tty --command-fd 0 --edit-key 7D851EB72D73BDA0
9596
pass init 7D851EB72D73BDA0
9697
fi
@@ -104,7 +105,7 @@ jobs:
104105
file: ./coverage.txt
105106

106107
test-sandboxed:
107-
runs-on: ubuntu-20.04
108+
runs-on: ubuntu-22.04
108109
steps:
109110
-
110111
name: Checkout
@@ -127,7 +128,7 @@ jobs:
127128
file: ${{ env.DESTDIR }}//coverage.txt
128129

129130
build:
130-
runs-on: ubuntu-20.04
131+
runs-on: ubuntu-22.04
131132
steps:
132133
-
133134
name: Checkout
@@ -173,7 +174,7 @@ jobs:
173174
files: ${{ env.DESTDIR }}/*
174175

175176
build-deb:
176-
runs-on: ubuntu-20.04
177+
runs-on: ubuntu-22.04
177178
steps:
178179
-
179180
name: Checkout

0 commit comments

Comments
 (0)