Skip to content

Commit ebda877

Browse files
committed
GitHub: upgrade runner to ubuntu-22.04
1 parent 3252013 commit ebda877

File tree

2 files changed

+34
-32
lines changed

2 files changed

+34
-32
lines changed

.github/workflows/ci.yml

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -94,28 +94,28 @@ 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
110110
- clang: "8"
111111
cxxflags: -fsanitize=leak -fno-sanitize-recover=all
112-
runner: ubuntu-20.04
112+
runner: ubuntu-22.04
113113
- clang: "9"
114114
cxxflags: -fsanitize=undefined -fno-sanitize-recover=all
115-
runner: ubuntu-20.04
115+
runner: ubuntu-22.04
116116
- clang: "10"
117117
cxxflags: -fsanitize=address -fno-sanitize-recover=all
118-
runner: ubuntu-20.04
118+
runner: ubuntu-22.04
119119
- clang: "11"
120120
runner: ubuntu-22.04
121121
- clang: "12"
@@ -131,6 +131,8 @@ jobs:
131131
- name: Add archive repositories
132132
if: matrix.archive
133133
run: |
134+
sudo gpg --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
135+
sudo gpg --export 3B4FE6ACC0B21F32 | sudo tee /etc/apt/trusted.gpg.d/ubuntu-keyring.gpg > /dev/null
134136
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} main'
135137
sudo add-apt-repository -yn 'deb http://archive.ubuntu.com/ubuntu/ ${{ matrix.archive }} universe'
136138
- name: Install Clang ${{ matrix.clang }}
@@ -141,7 +143,7 @@ jobs:
141143
if: matrix.clang >= 11
142144
run: sudo apt-get install -y libc++-${{ matrix.clang }}-dev libc++abi-${{ matrix.clang }}-dev
143145
- name: Install libunwind ${{ matrix.clang }}
144-
if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
146+
if: matrix.clang == 12 # dependency is missing in Ubuntu 22.04
145147
run: sudo apt-get install -y libunwind-${{ matrix.clang }}-dev
146148
- name: Checkout
147149
uses: actions/checkout@v4
@@ -163,7 +165,7 @@ jobs:
163165
conf_test:
164166
name: Test configuration on Linux
165167
needs: [gcc, clang]
166-
runs-on: ubuntu-20.04
168+
runs-on: ubuntu-22.04
167169
steps:
168170
- name: Install
169171
run: |
@@ -257,7 +259,7 @@ jobs:
257259
board: arduino:avr:uno
258260
- core: arduino:samd
259261
board: arduino:samd:mkr1000
260-
runs-on: ubuntu-20.04
262+
runs-on: ubuntu-22.04
261263
steps:
262264
- name: Checkout
263265
uses: actions/checkout@v4
@@ -412,7 +414,7 @@ jobs:
412414
arm:
413415
name: GCC for ARM processor
414416
needs: gcc
415-
runs-on: ubuntu-20.04
417+
runs-on: ubuntu-22.04
416418
steps:
417419
- name: Install
418420
run: |
@@ -431,7 +433,7 @@ jobs:
431433
coverage:
432434
needs: gcc
433435
name: Coverage
434-
runs-on: ubuntu-20.04
436+
runs-on: ubuntu-22.04
435437
steps:
436438
- name: Install
437439
run: sudo apt-get install -y lcov ninja-build
@@ -463,7 +465,7 @@ jobs:
463465
valgrind:
464466
needs: gcc
465467
name: Valgrind
466-
runs-on: ubuntu-20.04
468+
runs-on: ubuntu-22.04
467469
steps:
468470
- name: Install
469471
run: |
@@ -485,7 +487,7 @@ jobs:
485487
clang-tidy:
486488
needs: clang
487489
name: Clang-Tidy
488-
runs-on: ubuntu-20.04
490+
runs-on: ubuntu-22.04
489491
steps:
490492
- name: Install
491493
run: sudo apt-get install -y clang-tidy cmake ninja-build
@@ -502,7 +504,7 @@ jobs:
502504
amalgamate:
503505
needs: gcc
504506
name: Amalgamate ArduinoJson.h
505-
runs-on: ubuntu-20.04
507+
runs-on: ubuntu-22.04
506508
steps:
507509
- name: Checkout
508510
uses: actions/checkout@v4
@@ -578,7 +580,7 @@ jobs:
578580
579581
codeql:
580582
name: CodeQL
581-
runs-on: ubuntu-20.04
583+
runs-on: ubuntu-22.04
582584
needs: gcc
583585

584586
permissions:
@@ -587,20 +589,20 @@ jobs:
587589
security-events: write
588590

589591
steps:
590-
- name: Checkout repository
591-
uses: actions/checkout@v4
592+
- name: Checkout repository
593+
uses: actions/checkout@v4
592594

593-
- name: Initialize CodeQL
594-
uses: github/codeql-action/init@v3
595-
with:
596-
languages: cpp
595+
- name: Initialize CodeQL
596+
uses: github/codeql-action/init@v3
597+
with:
598+
languages: cpp
597599

598-
- name: Build
599-
run: |
600-
cmake -DCMAKE_BUILD_TYPE=Debug .
601-
cmake --build .
600+
- name: Build
601+
run: |
602+
cmake -DCMAKE_BUILD_TYPE=Debug .
603+
cmake --build .
602604
603-
- name: Perform CodeQL Analysis
604-
uses: github/codeql-action/analyze@v3
605-
with:
606-
category: "/language:cpp"
605+
- name: Perform CodeQL Analysis
606+
uses: github/codeql-action/analyze@v3
607+
with:
608+
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)