mirror of https://github.com/YosysHQ/yosys.git
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.
This commit is contained in:
parent
aa470ccb47
commit
f408b4de05
|
@ -24,9 +24,10 @@ jobs:
|
||||||
concurrent_skipping: 'same_content_newer'
|
concurrent_skipping: 'same_content_newer'
|
||||||
|
|
||||||
build-yosys:
|
build-yosys:
|
||||||
|
name: Build Yosys
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
needs: pre_job
|
needs: pre_job
|
||||||
if: needs.pre_job.outputs.should_skip != 'true'
|
if: needs.pre_job.outputs.should_skip != 'true'
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
env:
|
env:
|
||||||
CC: ${{ matrix.compiler }}
|
CC: ${{ matrix.compiler }}
|
||||||
CXX: ${{ matrix.compiler }}
|
CXX: ${{ matrix.compiler }}
|
||||||
|
@ -35,7 +36,6 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
os:
|
||||||
- ubuntu-20.04
|
- ubuntu-20.04
|
||||||
- macos-13
|
|
||||||
compiler:
|
compiler:
|
||||||
- 'clang-12'
|
- 'clang-12'
|
||||||
- 'gcc-11'
|
- 'gcc-11'
|
||||||
|
@ -45,20 +45,27 @@ jobs:
|
||||||
- 'c++17'
|
- 'c++17'
|
||||||
- 'c++20'
|
- 'c++20'
|
||||||
include:
|
include:
|
||||||
|
# Add os_name
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
os_name: focal
|
||||||
# Build for testing
|
# Build for testing
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
|
os_name: focal
|
||||||
|
compiler: 'clang'
|
||||||
|
cpp_std: 'c++11'
|
||||||
|
# macOS build
|
||||||
|
- os: macos-13
|
||||||
compiler: 'clang'
|
compiler: 'clang'
|
||||||
cpp_std: 'c++11'
|
cpp_std: 'c++11'
|
||||||
# Limited testing for older compilers
|
# Limited testing for older compilers
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
|
os_name: focal
|
||||||
compiler: 'clang-11'
|
compiler: 'clang-11'
|
||||||
cpp_std: 'c++11'
|
cpp_std: 'c++11'
|
||||||
- os: ubuntu-20.04
|
- os: ubuntu-20.04
|
||||||
|
os_name: focal
|
||||||
compiler: 'gcc-10'
|
compiler: 'gcc-10'
|
||||||
cpp_std: 'c++11'
|
cpp_std: 'c++11'
|
||||||
# Add os_name
|
|
||||||
- os: ubuntu-20.04
|
|
||||||
os_name: focal
|
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
steps:
|
steps:
|
||||||
- name: Install Linux Dependencies
|
- name: Install Linux Dependencies
|
||||||
|
|
Loading…
Reference in New Issue