Skip to content

Commit f207e51

Browse files
committed
Updates to the GHA build settings
1 parent 0a7d5b1 commit f207e51

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

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

+20-31
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@
33

44
# This is YAML - indentation levels are crucial
55

6-
# Set the 'name:' properties to values that work for you (pvxs)
6+
# Workflow name
77

88
name: Base
99

1010
# Trigger on pushes and PRs to any branch
1111
on:
1212
push:
1313
paths-ignore:
14-
- '.*.yml'
1514
- 'documentation/*'
16-
- '**/*.md'
15+
- '.*.yml'
1716
pull_request:
1817
paths-ignore:
19-
- '.*.yml'
2018
- 'documentation/*'
21-
- '**/*.md'
19+
- '.*.yml'
2220

2321
env:
2422
SETUP_PATH: .ci-local:.ci
@@ -33,35 +31,26 @@ jobs:
3331
BASE: ${{ matrix.base }}
3432
CMP: ${{ matrix.cmp }}
3533
BCFG: ${{ matrix.configuration }}
36-
WINE: ${{ matrix.wine }}
37-
RTEMS: ${{ matrix.rtems }}
38-
RTEMS_TARGET: ${{ matrix.rtems_target }}
34+
CI_CROSS_TARGETS: ${{ matrix.cross }}
3935
EXTRA: ${{ matrix.extra }}
4036
TEST: ${{ matrix.test }}
4137
strategy:
4238
fail-fast: false
4339
matrix:
4440
# Job names also name artifacts, character limitations apply
4541
include:
46-
- os: ubuntu-20.04
47-
cmp: gcc
48-
configuration: default
49-
base: "3.15"
50-
wine: "64"
51-
name: "3.15 Ub-20 gcc-9 + MinGW"
52-
5342
- os: ubuntu-20.04
5443
cmp: gcc
5544
configuration: default
5645
base: "7.0"
57-
wine: "64"
46+
cross: "windows-x64-mingw"
5847
name: "7.0 Ub-20 gcc-9 + MinGW"
5948

6049
- os: ubuntu-20.04
6150
cmp: gcc
6251
configuration: static
6352
base: "7.0"
64-
wine: "64"
53+
cross: "windows-x64-mingw"
6554
name: "7.0 Ub-20 gcc-9 + MinGW, static"
6655

6756
- os: ubuntu-20.04
@@ -88,26 +77,22 @@ jobs:
8877
cmp: gcc
8978
configuration: default
9079
base: "7.0"
91-
rtems: "5"
92-
rtems_target: RTEMS-pc686-qemu
93-
test: NO
80+
cross: "RTEMS-pc686-qemu@5"
9481
name: "7.0 Ub-20 gcc-9 + RT-5.1 pc686"
9582

9683
- os: ubuntu-20.04
9784
cmp: gcc
9885
configuration: default
9986
base: "7.0"
100-
rtems: "4.10"
101-
rtems_target: RTEMS-pc386-qemu
87+
10288
test: NO
10389
name: "7.0 Ub-20 gcc-9 + RT-4.10"
10490

10591
- os: ubuntu-20.04
10692
cmp: gcc
10793
configuration: default
10894
base: "7.0"
109-
rtems: "4.9"
110-
rtems_target: RTEMS-pc386-qemu
95+
11196
name: "7.0 Ub-20 gcc-9 + RT-4.9"
11297

11398
- os: macos-latest
@@ -121,12 +106,14 @@ jobs:
121106
configuration: default
122107
base: "7.0"
123108
name: "7.0 Win2019 MSC-19"
109+
extra: "CMD_CXXFLAGS=-analysis"
124110

125111
- os: windows-2019
126112
cmp: vs2019
127113
configuration: static
128114
base: "7.0"
129115
name: "7.0 Win2019 MSC-19, static"
116+
extra: "CMD_CXXFLAGS=-analysis"
130117

131118
- os: windows-2019
132119
cmp: vs2019
@@ -140,15 +127,17 @@ jobs:
140127
base: "7.0"
141128
name: "7.0 Win2019 mingw"
142129

130+
- os: ubuntu-20.04
131+
cmp: gcc
132+
configuration: default
133+
base: "3.15"
134+
wine: "64"
135+
name: "3.15 Ub-20 gcc-9 + MinGW"
136+
143137
steps:
144-
- uses: actions/checkout@v2
138+
- uses: actions/checkout@v3
145139
with:
146140
submodules: true
147-
- name: Cache Dependencies
148-
uses: actions/cache@v2
149-
with:
150-
path: ~/.cache
151-
key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.rtems_target }}/${{ matrix.extra }}
152141
- name: Automatic core dump analysis
153142
uses: mdavidsaver/ci-core-dumper@master
154143
- name: "apt-get install"
@@ -164,7 +153,7 @@ jobs:
164153
run: python .ci/cue.py -T 20M test
165154
- name: Upload tapfiles Artifact
166155
if: ${{ always() }}
167-
uses: actions/upload-artifact@v2
156+
uses: actions/upload-artifact@v3
168157
with:
169158
name: tapfiles ${{ matrix.name }}
170159
path: '**/O.*/*.tap'

0 commit comments

Comments
 (0)