Skip to content

Commit

Permalink
Chore: updated upstream dwarfs
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Nov 30, 2023
1 parent af347cd commit 4e0d1f6
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion common.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.0
0.4.1

0 comments on commit 4e0d1f6

Please sign in to comment.