Skip to content

Commit 4e4f33e

Browse files
ralphlangeralphlange
committed
ci: update GHA examples
1 parent df2367f commit 4e4f33e

2 files changed

Lines changed: 43 additions & 140 deletions

File tree

‎github-actions/ci-scripts-build.yml.example-full‎

Lines changed: 30 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -41,113 +41,57 @@ jobs:
4141
matrix:
4242
# Job names also name artifacts, character limitations apply
4343
include:
44-
- os: ubuntu-20.04
44+
- os: ubuntu-24.04
4545
cmp: gcc
4646
configuration: default
4747
wine: "64"
48-
name: "Ub-20 gcc-9 + MinGW"
48+
name: "Ub-24 gcc + MinGW"
4949

50-
- os: ubuntu-20.04
50+
- os: ubuntu-24.04
5151
cmp: gcc
5252
configuration: static
5353
wine: "64"
54-
name: "Ub-20 gcc-9 + MinGW, static"
54+
name: "Ub-24 gcc + MinGW, static"
5555

56-
- os: ubuntu-20.04
56+
- os: ubuntu-24.04
5757
cmp: gcc
5858
configuration: static
5959
extra: "CMD_CXXFLAGS=-std=c++11"
60-
name: "Ub-20 gcc-9 C++11, static"
60+
name: "Ub-24 gcc C++11, static"
6161

62-
- os: ubuntu-18.04
63-
cmp: clang
64-
configuration: default
65-
name: "Ub-18 clang-9"
66-
67-
- os: ubuntu-20.04
62+
- os: ubuntu-24.04
6863
cmp: clang
6964
configuration: default
7065
extra: "CMD_CXXFLAGS=-std=c++11"
71-
name: "Ub-20 clang-10 C++11"
72-
73-
- os: ubuntu-20.04
74-
cmp: gcc
75-
configuration: default
76-
rtems: "4.10"
77-
name: "Ub-20 gcc-9 + RT-4.10"
66+
name: "Ub-24 clang C++11"
7867

79-
- os: ubuntu-20.04
68+
- os: ubuntu-22.04
8069
cmp: gcc
8170
configuration: default
82-
rtems: "4.9"
83-
name: "Ub-20 gcc-9 + RT-4.9"
71+
cross: "RTEMS-pc686-qemu@5"
72+
name: "Ub-22 gcc + RT-5.1 pc686"
8473

85-
- os: ubuntu-20.04
74+
- os: ubuntu-22.04
8675
cmp: gcc
8776
configuration: default
88-
rtems: "5"
89-
rtems_target: RTEMS-pc686-qemu
90-
name: "Ub-20 gcc-9 + RT-5.1 pc686"
91-
92-
- os: ubuntu-20.04
93-
cmp: gcc
94-
configuration: default
95-
rtems: "5"
96-
rtems_target: RTEMS-beatnik
77+
cross: "RTEMS-beatnik@5"
9778
test: NO
98-
name: "Ub-20 gcc-9 + RT-5.1 beatnik"
99-
100-
- os: ubuntu-18.04
101-
cmp: gcc
102-
configuration: default
103-
name: "Ub-18 gcc-7"
104-
105-
- os: ubuntu-18.04
106-
cmp: gcc-8
107-
utoolchain: true
108-
configuration: default
109-
name: "Ub-18 gcc-8"
110-
111-
- os: ubuntu-20.04
112-
cmp: gcc-8
113-
utoolchain: true
114-
configuration: default
115-
name: "Ub-20 gcc-8"
116-
117-
- os: ubuntu-20.04
118-
cmp: clang
119-
configuration: default
120-
name: "Ub-20 clang-10"
121-
122-
- os: macos-11
123-
cmp: clang
124-
configuration: default
125-
name: "MacOS clang-13"
79+
name: "Ub-22 gcc + RT-5.1 beatnik"
12680

127-
- os: macos-12
81+
- os: macos-latest
12882
cmp: clang
12983
configuration: default
130-
name: "MacOS clang-13"
84+
name: "MacOS clang"
13185

132-
- os: windows-2019
86+
- os: windows-2022
13387
cmp: gcc
13488
configuration: default
135-
name: "Win2019 MinGW"
89+
name: "Win2022 MinGW"
13690

137-
- os: windows-2019
91+
- os: windows-2022
13892
cmp: gcc
13993
configuration: static
140-
name: "Win2019 MinGW, static"
141-
142-
- os: windows-2019
143-
cmp: vs2019
144-
configuration: default
145-
name: "Win2019 MSC-19"
146-
147-
- os: windows-2019
148-
cmp: vs2019
149-
configuration: static
150-
name: "Win2019 MSC-19, static"
94+
name: "Win2022 MinGW, static"
15195

15296
- os: windows-2022
15397
cmp: vs2022
@@ -159,8 +103,14 @@ jobs:
159103
configuration: static
160104
name: "Win2022 MSC-22, static"
161105

106+
- os: ubuntu-latest
107+
cmp: gcc
108+
configuration: default
109+
name: "Cross linux-aarch64"
110+
cross: linux-aarch64
111+
162112
steps:
163-
- uses: actions/checkout@v3
113+
- uses: actions/checkout@v4
164114
with:
165115
submodules: true
166116
- name: Automatic core dumper analysis
@@ -170,58 +120,17 @@ jobs:
170120
sudo apt-get update
171121
sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
172122
if: runner.os == 'Linux'
173-
- name: "apt-get install ${{ matrix.cmp }}"
174-
run: |
175-
sudo apt-get -y install software-properties-common
176-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
177-
sudo apt-get update
178-
sudo apt-get -y install ${{ matrix.cmp }}
179-
if: matrix.utoolchain
180123
- name: Prepare and compile dependencies
181124
run: python .ci/cue.py prepare
182125
- name: Build main module
183126
run: python .ci/cue.py build
184127
- name: Run main module tests
185128
run: python .ci/cue.py -T 15M test
186129
- name: Upload tapfiles Artifact
187-
uses: actions/upload-artifact@v2
130+
uses: actions/upload-artifact@v4
188131
with:
189132
name: tapfiles ${{ matrix.name }}
190133
path: '**/O.*/*.tap'
191134
- name: Collect and show test results
192-
run: python .ci/cue.py test-results
193-
194-
build-cross:
195-
name: cross ${{ matrix.cross }} / ${{ matrix.cmp }} / ${{ matrix.configuration }}
196-
runs-on: ubuntu-20.04
197-
env:
198-
CMP: gcc
199-
BCFG: default
200-
CI_CROSS_TARGETS: ${{ matrix.cross }}
201-
APT: re2c
202-
strategy:
203-
fail-fast: false
204-
matrix:
205-
# configuration: [default, static, debug, static-debug]
206-
configuration: [default]
207-
cross:
208-
- linux-aarch64
209-
- linux-arm@arm-linux-gnueabi
210-
- linux-arm@arm-linux-gnueabihf
211-
- linux-ppc
212-
- linux-ppc64
213-
- win32-x86-mingw
214-
- windows-x64-mingw
215-
- RTEMS-pc386-qemu@4.9
216-
- RTEMS-pc386-qemu@4.10
217-
- RTEMS-pc686-qemu@5
218-
steps:
219-
- uses: actions/checkout@v3
220-
- name: Prepare and compile dependencies
221-
run: python cue.py prepare
222-
- name: Build main module
223-
run: python cue.py build
224-
- name: Run main module tests
225-
run: python cue.py -T 15M test
226-
- name: Collect and show test results
227-
run: python cue.py test-results
135+
if: ${{ always() }}
136+
run: python .ci/cue.py -T 5M test-results

‎github-actions/ci-scripts-build.yml.example-mini‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,38 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
include:
35-
- os: ubuntu-18.04
35+
- os: ubuntu-24.04
3636
cmp: gcc
3737
configuration: default
38-
base: "7.0"
39-
name: "7.0 Ub-18 gcc-7"
40-
41-
- os: ubuntu-18.04
42-
cmp: gcc
43-
configuration: static
44-
base: "7.0"
45-
name: "7.0 Ub-18 gcc-7 static"
38+
base: "3.15"
39+
name: "3.15 Ub-24 gcc"
4640

47-
- os: ubuntu-20.04
41+
- os: ubuntu-24.04
4842
cmp: gcc
4943
configuration: default
50-
base: "3.15"
51-
name: "3.15 Ub-20 gcc-9"
44+
base: "7.0"
45+
name: "7.0 Ub-24 gcc"
5246

53-
- os: ubuntu-20.04
47+
- os: ubuntu-24.04
5448
cmp: gcc
5549
configuration: static
5650
base: "3.15"
57-
name: "3.15 Ub-20 gcc-9 static"
51+
name: "3.15 Ub-24 gcc static"
5852

59-
- os: ubuntu-20.04
53+
- os: ubuntu-24.04
6054
cmp: gcc
6155
configuration: debug
6256
base: "3.15"
63-
name: "3.15 Ub-20 gcc-9 debug"
57+
name: "3.15 Ub-24 gcc debug"
6458

65-
- os: ubuntu-20.04
59+
- os: ubuntu-24.04
6660
cmp: clang
6761
configuration: default
6862
base: "3.15"
69-
name: "3.15 Ub-20 clang-10"
63+
name: "3.15 Ub-24 clang"
7064

7165
steps:
72-
- uses: actions/checkout@v3
66+
- uses: actions/checkout@v4
7367
with:
7468
submodules: true
7569
- name: Prepare and compile dependencies

0 commit comments

Comments
 (0)