github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: add ubuntu-22.04 regressions

Browse Source
This commit is contained in:
Geza Lore 2022-05-30 16:51:40 +01:00
parent 606b35853b
commit 694919b9d1
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-20.04, ubuntu-18.04] os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
compiler: compiler:
- { cc: clang, cxx: clang++ } - { cc: clang, cxx: clang++ }
- { cc: gcc, cxx: g++ } - { cc: gcc, cxx: g++ }
@ -37,9 +37,11 @@ jobs:
exclude: exclude:
# Build pull requests only with ubuntu-20.04 and without m32 # Build pull requests only with ubuntu-20.04 and without m32
- os: ${{ github.event_name == 'pull_request' && 'ubuntu-18.04' || 'do-not-exclude' }} - os: ${{ github.event_name == 'pull_request' && 'ubuntu-18.04' || 'do-not-exclude' }}
- os: ${{ github.event_name == 'pull_request' && 'ubuntu-22.04' || 'do-not-exclude' }}
- m32: ${{ github.event_name == 'pull_request' && 1 || 'do-not-exclude' }} - m32: ${{ github.event_name == 'pull_request' && 1 || 'do-not-exclude' }}
# Build -m32 only on ubuntu-20.04 # Build -m32 only on ubuntu-20.04
- {os: ubuntu-18.04, m32: 1} - {os: ubuntu-18.04, m32: 1}
- {os: ubuntu-22.04, m32: 1}
include: include:
# Build GCC 10 on ubuntu-20.04 # Build GCC 10 on ubuntu-20.04
- os: ubuntu-20.04 - os: ubuntu-20.04
@ -95,7 +97,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ubuntu-20.04, ubuntu-18.04] os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
compiler: compiler:
- { cc: clang, cxx: clang++ } - { cc: clang, cxx: clang++ }
- { cc: gcc, cxx: g++ } - { cc: gcc, cxx: g++ }
@ -104,9 +106,11 @@ jobs:
exclude: exclude:
# Build pull requests only with ubuntu-20.04 and without m32 # Build pull requests only with ubuntu-20.04 and without m32
- os: ${{ github.event_name == 'pull_request' && 'ubuntu-18.04' || 'do-not-exclude' }} - os: ${{ github.event_name == 'pull_request' && 'ubuntu-18.04' || 'do-not-exclude' }}
- os: ${{ github.event_name == 'pull_request' && 'ubuntu-22.04' || 'do-not-exclude' }}
- m32: ${{ github.event_name == 'pull_request' && 1 || 'do-not-exclude' }} - m32: ${{ github.event_name == 'pull_request' && 1 || 'do-not-exclude' }}
# Build -m32 only on ubuntu-20.04 # Build -m32 only on ubuntu-20.04
- {os: ubuntu-18.04, m32: 1} - {os: ubuntu-18.04, m32: 1}
- {os: ubuntu-22.04, m32: 1}
include: include:
# Test with GCC 10 on ubuntu-20.04 without m32 # Test with GCC 10 on ubuntu-20.04 without m32
- {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, m32: 0, suite: dist-vlt-0} - {os: ubuntu-20.04, compiler: { cc: gcc-10, cxx: g++-10 }, m32: 0, suite: dist-vlt-0}

10
ci/ci-install.bash
View File

@ -54,8 +54,12 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then
if [ "$CI_OS_NAME" = "linux" ]; then if [ "$CI_OS_NAME" = "linux" ]; then
sudo apt-get update sudo apt-get update
sudo apt-get install libfl-dev libgoogle-perftools-dev ccache sudo apt-get install libfl-dev ccache
if [ "$CI_RUNS_ON" = "ubuntu-20.04" ]; then if [ "$CI_RUNS_ON" != "ubuntu-22.04" ]; then
# Some conflict of libunwind verison on 22.04, can live without it for now
sudo apt-get install libgoogle-perftools-dev
fi
if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then
sudo apt-get install libsystemc libsystemc-dev sudo apt-get install libsystemc libsystemc-dev
fi fi
if [ "$COVERAGE" = 1 ]; then if [ "$COVERAGE" = 1 ]; then
@ -85,7 +89,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then
sudo apt-get update sudo apt-get update
# libfl-dev needed for internal coverage's test runs # libfl-dev needed for internal coverage's test runs
sudo apt-get install gdb gtkwave lcov libfl-dev ccache sudo apt-get install gdb gtkwave lcov libfl-dev ccache
if [ "$CI_RUNS_ON" = "ubuntu-20.04" ]; then if [ "$CI_RUNS_ON" = "ubuntu-20.04" ] || [ "$CI_RUNS_ON" = "ubuntu-22.04" ]; then
sudo apt-get install libsystemc-dev sudo apt-get install libsystemc-dev
fi fi
if [ "$CI_M32" = 1 ]; then if [ "$CI_M32" = 1 ]; then

2
configure.ac
View File

@ -349,7 +349,7 @@ AC_SUBST(CFG_CXXFLAGS_PROFILE)
# Flag to select newest language standard supported # Flag to select newest language standard supported
# Macros work such that first option that passes is the one we take # Macros work such that first option that passes is the one we take
# Currently enable c++17/c++14 due to packaged SystemC dependency # Currently enable c++17/c++14 due to packaged SystemC dependency
# c++14 is the newest that Verilator is regressed to support # c++17 is the newest that Verilator is regularly tested to support
# c++11 is the oldest that Verilator supports # c++11 is the oldest that Verilator supports
# gnu is requried for Cygwin to compile verilated.h successfully # gnu is requried for Cygwin to compile verilated.h successfully
#_MY_CXX_CHECK_SET(CFG_CXXFLAGS_STD_NEWEST,-std=gnu++20) #_MY_CXX_CHECK_SET(CFG_CXXFLAGS_STD_NEWEST,-std=gnu++20)