Skip to content

Commit dd026d1

Browse files
authored
Merge 743dd61 into c32e100
2 parents c32e100 + 743dd61 commit dd026d1

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

.github/workflows/ci-scripts-build.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,68 +39,69 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- os: ubuntu-20.04
42+
- os: ubuntu-22.04
4343
cmp: gcc
4444
configuration: default
4545
base: "7.0"
4646
wine: "64"
4747

48-
- os: ubuntu-20.04
48+
- os: ubuntu-22.04
4949
cmp: gcc
5050
configuration: static
5151
base: "7.0"
5252

53-
- os: ubuntu-20.04
53+
- os: ubuntu-22.04
5454
cmp: gcc
5555
configuration: default
5656
base: "3.15"
5757

58-
- os: ubuntu-20.04
58+
- os: ubuntu-22.04
5959
cmp: gcc
6060
configuration: default
6161
base: "3.14"
6262

63-
- os: ubuntu-20.04
63+
- os: ubuntu-22.04
6464
cmp: gcc
6565
configuration: static
6666
base: "7.0"
6767
extra: "CMD_CXXFLAGS=-std=c++11"
6868

69-
- os: ubuntu-20.04
69+
- os: ubuntu-22.04
7070
cmp: clang
7171
configuration: default
7272
base: "7.0"
7373
extra: "CMD_CXXFLAGS=-std=c++11"
7474

75-
- os: ubuntu-20.04
76-
cmp: gcc
77-
configuration: default
78-
base: "7.0"
79-
rtems: "4.10"
75+
# It requires more debugging:
76+
# - os: ubuntu-22.04
77+
# cmp: gcc
78+
# configuration: default
79+
# base: "7.0"
80+
# rtems: "4.10"
8081

81-
- os: ubuntu-20.04
82+
- os: ubuntu-22.04
8283
cmp: gcc
8384
configuration: default
8485
base: "7.0"
8586
rtems: "4.9"
8687

87-
- os: ubuntu-20.04
88-
cmp: gcc-8
89-
utoolchain: "8"
88+
- os: ubuntu-22.04
89+
cmp: gcc-9
90+
utoolchain: "9"
9091
configuration: default
9192
base: "7.0"
9293

93-
- os: ubuntu-20.04
94+
- os: ubuntu-22.04
9495
cmp: clang
9596
configuration: default
9697
base: "7.0"
9798

9899
steps:
99-
- uses: actions/checkout@v2
100+
- uses: actions/checkout@v3
100101
with:
101102
submodules: true
102103
- name: Cache Dependencies
103-
uses: actions/cache@v2
104+
uses: actions/cache@v3
104105
with:
105106
path: ~/.cache
106107
key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}

0 commit comments

Comments
 (0)