Skip to content

Commit 157a94a

Browse files
ci: fix compiler setup
`os_name` in include section needs to be explicit (putting it at the end doesn't apply to the extra jobs). Move macOS test to extra job instead of doing all gcc/clang (which isn't setup for mac anyway). Also adds name to build-yosys task.
1 parent dea490b commit 157a94a

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

.github/workflows/test-build.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
jobs:
1212
build-yosys:
13+
name: Build Yosys
1314
runs-on: ${{ matrix.os }}
1415
env:
1516
CC: ${{ matrix.compiler }}
@@ -19,7 +20,6 @@ jobs:
1920
matrix:
2021
os:
2122
- ubuntu-20.04
22-
- macos-13
2323
compiler:
2424
- 'clang-12'
2525
- 'gcc-11'
@@ -29,20 +29,27 @@ jobs:
2929
- 'c++17'
3030
- 'c++20'
3131
include:
32+
# Add os_name
33+
- os: ubuntu-20.04
34+
os_name: focal
3235
# Build for testing
3336
- os: ubuntu-20.04
37+
os_name: focal
38+
compiler: 'clang'
39+
cpp_std: 'c++11'
40+
# macOS build
41+
- os: macos-13
3442
compiler: 'clang'
3543
cpp_std: 'c++11'
3644
# Limited testing for older compilers
3745
- os: ubuntu-20.04
46+
os_name: focal
3847
compiler: 'clang-11'
3948
cpp_std: 'c++11'
4049
- os: ubuntu-20.04
50+
os_name: focal
4151
compiler: 'gcc-10'
4252
cpp_std: 'c++11'
43-
# Add os_name
44-
- os: ubuntu-20.04
45-
os_name: focal
4653
fail-fast: false
4754
steps:
4855
- name: Install Linux Dependencies

0 commit comments

Comments
 (0)