diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index a172d758..d061bf91 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -57,17 +57,21 @@ env: jobs: build: - name: ${{ matrix.os }} [CC ${{ matrix.env.CC }}, ASAN ${{ matrix.env.ASAN }}, COVERAGE ${{ matrix.env.COVERAGE }}, ${{ matrix.env.LOG_LEVEL }} ] - runs-on: ${{ matrix.os }} + name: ${{ matrix.env.os }} [CC ${{ matrix.env.CC }}, ASAN ${{ matrix.env.ASAN }}, COVERAGE ${{ matrix.env.COVERAGE }}, ${{ matrix.env.LOG_LEVEL }} ] + runs-on: ${{ matrix.env.os }} strategy: fail-fast: false matrix: - os: [ ubuntu-20.04 ] env: - - { CC: gcc-10, CXX: g++-10, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'trace' } - - { CC: gcc-10, CXX: g++-10, ASAN: 'OFF', COVERAGE: 'ON', LOG_LEVEL: 'warn' } - - { CC: clang-12, CXX: clang++-12, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } - - { CC: clang-12, CXX: clang++-12, ASAN: 'ON', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } + - { os: ubuntu-20.04, CC: gcc-10, CXX: g++-10, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'trace' } + - { os: ubuntu-20.04, CC: gcc-10, CXX: g++-10, ASAN: 'OFF', COVERAGE: 'ON', LOG_LEVEL: 'warn' } + - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } + - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12, ASAN: 'ON', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } +# https://github.com/llvm/llvm-project/issues/56357 +# On Ubuntu 22 affects clang 14 (file entry.cpp) + - { os: ubuntu-22.04, CC: clang-15, CXX: clang++-15, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } + - { os: ubuntu-22.04, CC: gcc-11, CXX: g++-11, ASAN: 'OFF', COVERAGE: 'OFF', LOG_LEVEL: 'warn' } + env: ${{ matrix.env }} steps: - name: Checkout @@ -89,7 +93,7 @@ jobs: uses: actions/cache@v3 with: path: ${{github.workspace}}/${{env.DEPS}} - key: ${{ matrix.os }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-${{ env.ASAN }}-${{ env.COVERAGE }}-${{ env.LOG_LEVEL }}-v${{ env.CACHE_VER }} + key: ${{ matrix.env.os }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-${{ env.ASAN }}-${{ env.COVERAGE }}-${{ env.LOG_LEVEL }}-v${{ env.CACHE_VER }} # Already installed: bison flex pkg-config diff --git a/CMakeLists.txt b/CMakeLists.txt index 79bf2484..faa9d752 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,7 @@ set(MSVC_LANGUAGE_VERSION "c++20" CACHE STRING "The C++ standard argument to pas # ................................................................... # External projects -def_ext_prj_g(DWARFS "tebako-v0.4.2") +def_ext_prj_g(DWARFS "tebako-v0.4.4") if(WITH_TESTS) def_ext_prj_g(INCBIN "348e36b") diff --git a/common.env b/common.env index 5f5b07e1..4bffc570 100644 --- a/common.env +++ b/common.env @@ -1,6 +1,6 @@ DEPS=deps INCBIN_TAG=348e36b -DWARFS_TAG=tebako-v0.4.2 +DWARFS_TAG=tebako-v0.4.4 GLOG_TAG=v0.5.0 GFLAGS_TAG=v2.2.2 DC_TAG=v3.2.0 diff --git a/version.txt b/version.txt index 1d0ba9ea..267577d4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.4.0 +0.4.1