Skip to content

Commit 0bf7d23

Browse files
authored
Merge pull request #54 from mdavidsaver/gh-actions
gh-actions: fix example configurations
2 parents e10326b + b592ab0 commit 0bf7d23

2 files changed

Lines changed: 35 additions & 27 deletions

File tree

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

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on: [push, pull_request]
1212

1313
env:
1414
SETUP_PATH: .ci-local:.ci
15-
SET: test01
1615
CMP: gcc
1716
# For the sequencer on Linux/Windows/MacOS
1817
APT: re2c
@@ -35,14 +34,16 @@ jobs:
3534
configuration: [default, static, debug, static-debug]
3635
steps:
3736
- uses: actions/checkout@v2
37+
with:
38+
submodules: true
3839
- name: Prepare and compile dependencies
39-
run: python cue.py prepare
40+
run: python .ci/cue.py prepare
4041
- name: Build main module
41-
run: python cue.py build
42+
run: python .ci/cue.py build
4243
- name: Run main module tests
43-
run: python cue.py test
44+
run: python .ci/cue.py test
4445
- name: Collect and show test results
45-
run: python cue.py test-results
46+
run: python .ci/cue.py test-results
4647

4748
build-macos:
4849
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
@@ -61,13 +62,13 @@ jobs:
6162
steps:
6263
- uses: actions/checkout@v2
6364
- name: Prepare and compile dependencies
64-
run: python cue.py prepare
65+
run: python .ci/cue.py prepare
6566
- name: Build main module
66-
run: python cue.py build
67+
run: python .ci/cue.py build
6768
- name: Run main module tests
68-
run: python cue.py test
69+
run: python .ci/cue.py test
6970
- name: Collect and show test results
70-
run: python cue.py test-results
71+
run: python .ci/cue.py test-results
7172

7273
build-windows:
7374
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
@@ -89,14 +90,16 @@ jobs:
8990
cmp: vs2019
9091
steps:
9192
- uses: actions/checkout@v2
93+
with:
94+
submodules: true
9295
- name: Prepare and compile dependencies
93-
run: python cue.py prepare
96+
run: python .ci/cue.py prepare
9497
- name: Build main module
95-
run: python cue.py build
98+
run: python .ci/cue.py build
9699
- name: Run main module tests
97-
run: python cue.py test
100+
run: python .ci/cue.py test
98101
- name: Collect and show test results
99-
run: python cue.py test-results
102+
run: python .ci/cue.py test-results
100103

101104
# Same setup and toolchain as on Travis.
102105
# Needs Base >= 3.15 to compile, EPICS 7 to also run the tests on qemu
@@ -113,18 +116,20 @@ jobs:
113116
matrix:
114117
os: [ubuntu-18.04]
115118
cmp: [gcc]
116-
configuration: [default, static, debug, static-debug]
119+
configuration: [default]
117120
rtems: ["4.9", "4.10"]
118121
steps:
119122
- uses: actions/checkout@v2
123+
with:
124+
submodules: true
120125
- name: Prepare and compile dependencies
121-
run: python cue.py prepare
126+
run: python .ci/cue.py prepare
122127
- name: Build main module
123-
run: python cue.py build
128+
run: python .ci/cue.py build
124129
- name: Run main module tests
125-
run: python cue.py test
130+
run: python .ci/cue.py test
126131
- name: Collect and show test results
127-
run: python cue.py test-results
132+
run: python .ci/cue.py test-results
128133

129134
# The WINE cross builds are of somewhat limited use,
130135
# as there are native gcc/MinGW builds available on GitHub Actions
@@ -145,11 +150,13 @@ jobs:
145150
wine: [32, 64]
146151
steps:
147152
- uses: actions/checkout@v2
153+
with:
154+
submodules: true
148155
- name: Prepare and compile dependencies
149-
run: python cue.py prepare
156+
run: python .ci/cue.py prepare
150157
- name: Build main module
151-
run: python cue.py build
158+
run: python .ci/cue.py build
152159
- name: Run main module tests
153-
run: python cue.py test
160+
run: python .ci/cue.py test
154161
- name: Collect and show test results
155-
run: python cue.py test-results
162+
run: python .ci/cue.py test-results

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on: [push, pull_request]
1212

1313
env:
1414
SETUP_PATH: .ci-local:.ci
15-
SET: test01
1615
CMP: gcc
1716

1817
jobs:
@@ -33,11 +32,13 @@ jobs:
3332
base: ["7.0", "3.15"]
3433
steps:
3534
- uses: actions/checkout@v2
35+
with:
36+
submodules: true
3637
- name: Prepare and compile dependencies
37-
run: python cue.py prepare
38+
run: python .ci/cue.py prepare
3839
- name: Build main module
39-
run: python cue.py build
40+
run: python .ci/cue.py build
4041
- name: Run main module tests
41-
run: python cue.py test
42+
run: python .ci/cue.py test
4243
- name: Collect and show test results
43-
run: python cue.py test-results
44+
run: python .ci/cue.py test-results

0 commit comments

Comments
 (0)