Skip to content

Commit

Permalink
Bump version dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sjanel committed Jan 14, 2024
1 parent eb54b76 commit 9eb9bbe
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.9.0
uses: jidicula/clang-format-action@v4.11.0
with:
check-path: ${{ matrix.path }}
fallback-style: "Google"
14 changes: 6 additions & 8 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,16 @@ on:

jobs:
xcode:
runs-on: macos-10.15
strategy:
matrix:
xcode: [12.4, 12.3, 12.2, 12.1.1, 12.1, 12, 11.7, 11.6, 11.5, 11.4.1, 11.3.1, 11.2.1]
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer

name: Build on MacOS
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: latest-stable
- name: cmake
run: cmake -S . -B build -D CMAKE_BUILD_TYPE=Release
- name: build
run: cmake --build build --parallel 2
- name: test
run: cd build && ctest -j 2 --output-on-failure
run: cd build && ctest -j 2 --output-on-failure
25 changes: 8 additions & 17 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
compiler: [g++-5, g++-7, g++-9, g++-11]
compiler: [g++-7, g++-9, g++-11]
steps:
- uses: actions/checkout@v2
- name: Install compiler
run: |
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial main" | sudo tee -a /etc/apt/sources.list
echo "deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe" | sudo tee -a /etc/apt/sources.list
echo "deb http://dk.archive.ubuntu.com/ubuntu/ focal main universe" | sudo tee -a /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -y ${{ matrix.compiler }}
- name: cmake
Expand All @@ -31,12 +30,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
compiler: [g++-6, g++-8, g++-10]
compiler: [g++-8, g++-10, g++-12]
steps:
- uses: actions/checkout@v2
- name: Install compiler
run: |
echo "deb http://dk.archive.ubuntu.com/ubuntu/ bionic main universe" | sudo tee -a /etc/apt/sources.list
echo "deb http://dk.archive.ubuntu.com/ubuntu/ focal main universe" | sudo tee -a /etc/apt/sources.list
sudo apt-get update
sudo apt-get install -y ${{ matrix.compiler }}
- name: cmake
Expand All @@ -50,18 +49,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
compiler: ["6.0", "8", "10", "12"]
compiler: ["15", "17"]
steps:
- uses: actions/checkout@v2
- name: Install compiler
run: sudo apt-get install clang++-${{ matrix.compiler }}
if: matrix.compiler == '6.0' || matrix.compiler == '8'
- name: Install compiler
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh ${{ matrix.compiler }}
if: matrix.compiler != '6.0' && matrix.compiler != '8'
- name: cmake
run: cmake -S . -B build -DCMAKE_CXX_COMPILER=clang++-${{ matrix.compiler }} -DCMAKE_BUILD_TYPE=Release
- name: build
Expand All @@ -73,18 +68,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
compiler: ["7", "9", "11", "13"]
compiler: ["16"]
steps:
- uses: actions/checkout@v2
- name: Install compiler
run: sudo apt-get install clang++-${{ matrix.compiler }}
if: matrix.compiler == '7'
- name: Install compiler
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh ${{ matrix.compiler }}
if: matrix.compiler != '7'
- name: cmake
run: cmake -S . -B build -DCMAKE_CXX_COMPILER=clang++-${{ matrix.compiler }} -DCMAKE_BUILD_TYPE=Debug
- name: build
Expand All @@ -93,11 +84,11 @@ jobs:
run: cd build && ctest -j 2 --output-on-failure

ci_test_standards:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
standard: [11, 14, 17, 20]
compiler: [g++-11, clang++-14]
compiler: [g++-11]
steps:
- uses: actions/checkout@v2
- name: Install compiler
Expand Down
19 changes: 0 additions & 19 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,6 @@ on:
pull_request:

jobs:
mingw:
runs-on: windows-latest
strategy:
matrix:
architecture: [x64, x86]

steps:
- uses: actions/checkout@v2
- name: Set up MinGW
uses: egor-tensin/setup-mingw@v2
with:
platform: ${{ matrix.architecture }}
- name: cmake
run: cmake -S . -B build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CROSSCOMPILING=1 -DRUN_HAVE_STD_REGEX=0
- name: build
run: cmake --build build --parallel 2
- name: test
run: cd build && ctest -j 2 --output-on-failure

msvc2019:
runs-on: windows-2019
strategy:
Expand Down
2 changes: 1 addition & 1 deletion benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (NOT benchmark_FOUND)
FetchContent_Declare(
googlebenchmark
GIT_REPOSITORY https://github.com/google/benchmark.git
GIT_TAG v1.6.0
GIT_TAG v1.8.3
)

FetchContent_MakeAvailable(googlebenchmark)
Expand Down

0 comments on commit 9eb9bbe

Please sign in to comment.