Skip to content

Commit 377cf63

Browse files
committed
CI: upgrade runner to ubuntu-22.04
1 parent 3252013 commit 377cf63

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -94,28 +94,32 @@ jobs:
9494
matrix:
9595
include:
9696
- clang: "3.9"
97-
runner: ubuntu-20.04
97+
runner: ubuntu-22.04
9898
archive: bionic
9999
- clang: "4.0"
100-
runner: ubuntu-20.04
100+
runner: ubuntu-22.04
101101
archive: bionic
102102
- clang: "5.0"
103-
runner: ubuntu-20.04
103+
runner: ubuntu-22.04
104104
archive: bionic
105105
- clang: "6.0"
106-
runner: ubuntu-20.04
106+
runner: ubuntu-22.04
107107
archive: bionic
108108
- clang: "7"
109-
runner: ubuntu-20.04
109+
runner: ubuntu-22.04
110+
archive: focal
110111
- clang: "8"
111112
cxxflags: -fsanitize=leak -fno-sanitize-recover=all
112-
runner: ubuntu-20.04
113+
runner: ubuntu-22.04
114+
archive: focal
113115
- clang: "9"
114116
cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
115-
runner: ubuntu-20.04
117+
runner: ubuntu-22.04
118+
archive: focal
116119
- clang: "10"
117120
cxxflags: -fsanitize=address -fno-sanitize-recover=all
118-
runner: ubuntu-20.04
121+
runner: ubuntu-22.04
122+
archive: focal
119123
- clang: "11"
120124
runner: ubuntu-22.04
121125
- clang: "12"
@@ -131,6 +135,8 @@ jobs:
131135
- name: Add archive repositories
132136
if: matrix.archive
133137
run: |
138+
sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
139+
sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
134140
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
135141
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
136142
- name: Install Clang ${{ matrix.clang }}
@@ -141,7 +147,7 @@ jobs:
141147
if: matrix.clang >= 11
142148
run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
143149
- name: Install libunwind ${{ matrix.clang }}
144-
if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
150+
if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
145151
run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
146152
- name: Checkout
147153
uses: actions/checkout@v4
@@ -163,7 +169,7 @@ jobs:
163169
conf_test:
164170
name: Test configuration on Linux
165171
needs: [gcc, clang]
166-
runs-on: ubuntu-20.04
172+
runs-on: ubuntu-22.04
167173
steps:
168174
- name: Install
169175
run: |
@@ -257,7 +263,7 @@ jobs:
257263
board: arduino:avr:uno
258264
- core: arduino:samd
259265
board: arduino:samd:mkr1000
260-
runs-on: ubuntu-20.04
266+
runs-on: ubuntu-22.04
261267
steps:
262268
- name: Checkout
263269
uses: actions/checkout@v4
@@ -412,7 +418,7 @@ jobs:
412418
arm:
413419
name: GCC for ARM processor
414420
needs: gcc
415-
runs-on: ubuntu-20.04
421+
runs-on: ubuntu-22.04
416422
steps:
417423
- name: Install
418424
run: |
@@ -431,7 +437,7 @@ jobs:
431437
coverage:
432438
needs: gcc
433439
name: Coverage
434-
runs-on: ubuntu-20.04
440+
runs-on: ubuntu-22.04
435441
steps:
436442
- name: Install
437443
run: sudo apt-get install -y lcov ninja-build
@@ -463,7 +469,7 @@ jobs:
463469
valgrind:
464470
needs: gcc
465471
name: Valgrind
466-
runs-on: ubuntu-20.04
472+
runs-on: ubuntu-22.04
467473
steps:
468474
- name: Install
469475
run: |
@@ -485,7 +491,7 @@ jobs:
485491
clang-tidy:
486492
needs: clang
487493
name: Clang-Tidy
488-
runs-on: ubuntu-20.04
494+
runs-on: ubuntu-22.04
489495
steps:
490496
- name: Install
491497
run: sudo apt-get install -y clang-tidy cmake ninja-build
@@ -502,7 +508,7 @@ jobs:
502508
amalgamate:
503509
needs: gcc
504510
name: Amalgamate ArduinoJson.h
505-
runs-on: ubuntu-20.04
511+
runs-on: ubuntu-22.04
506512
steps:
507513
- name: Checkout
508514
uses: actions/checkout@v4
@@ -578,7 +584,7 @@ jobs:
578584
579585
codeql:
580586
name: CodeQL
581-
runs-on: ubuntu-20.04
587+
runs-on: ubuntu-22.04
582588
needs: gcc
583589

584590
permissions:
@@ -587,20 +593,20 @@ jobs:
587593
security-events: write
588594

589595
steps:
590-
- name: Checkout repository
591-
uses: actions/checkout@v4
596+
- name: Checkout repository
597+
uses: actions/checkout@v4
592598

593-
- name: Initialize CodeQL
594-
uses: github/codeql-action/init@v3
595-
with:
596-
languages: cpp
599+
- name: Initialize CodeQL
600+
uses: github/codeql-action/init@v3
601+
with:
602+
languages: cpp
597603

598-
- name: Build
599-
run: |
600-
cmake -DCMAKE_BUILD_TYPE=Debug .
601-
cmake --build .
604+
- name: Build
605+
run: |
606+
cmake -DCMAKE_BUILD_TYPE=Debug .
607+
cmake --build .
602608
603-
- name: Perform CodeQL Analysis
604-
uses: github/codeql-action/analyze@v3
605-
with:
606-
category: "/language:cpp"
609+
- name: Perform CodeQL Analysis
610+
uses: github/codeql-action/analyze@v3
611+
with:
612+
category: "/language:cpp"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: Create release
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Set variables
1414
id: init

0 commit comments

Comments
 (0)