Skip to content

Commit

Permalink
Merge branch 'develop' into feature/c++23
Browse files Browse the repository at this point in the history
  • Loading branch information
acgetchell authored Sep 23, 2024
2 parents 3721dea + cc17bc1 commit bec7526
Show file tree
Hide file tree
Showing 38 changed files with 408 additions and 353 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/asan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +28,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: clang@17
+: clang@19

- run: clang --version

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
- 'src'
- 'include'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/clang-format-action@v4.11.0
uses: jidicula/clang-format-action@v4.13.0
with:
clang-format-version: '17'
clang-format-version: '18'
check-path: ${{ matrix.path }}
fallback-style: 'Google' # optional
12 changes: 4 additions & 8 deletions .github/workflows/codecov-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ on:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
workflow_dispatch:

concurrency:
Expand All @@ -21,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -32,9 +28,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup GCC
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: gcc@13
+: gcc@14

- run: gcc --version

Expand Down Expand Up @@ -71,7 +67,7 @@ jobs:
popd
- name: Submit to codecov.io
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
# directory: build/gcov-reports
fail_ci_if_error: false
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ on:
- main
- develop
pull_request:
# The branches below must be a subset of the branches above
branches:
- main
- develop
schedule:
- cron: '26 7 * * 0'
workflow_dispatch:
Expand Down Expand Up @@ -48,11 +44,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -66,9 +62,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup GCC
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: gcc@13
+: gcc@14

- run: gcc --version

Expand All @@ -84,4 +80,4 @@ jobs:
run: cmake --build build -j 2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/cpp-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ jobs:
cpp-linter:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: cpp-linter/cpp-linter-action@v2
id: linter
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
style: file
tidy-checks: ''
version: 16
version: 19

- name: Fail fast?!
if: steps.linter.outputs.checks-failed > 0
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: Cppcheck

on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:
on: [push, pull_request, workflow_dispatch]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -17,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +22,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache cppcheck
- name: Setup GCC
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: gcc@13
+: gcc@14

- run: gcc --version

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@ on:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: DenverCoder1/doxygen-github-pages-action@v1.3.0
- uses: DenverCoder1/doxygen-github-pages-action@v2.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/linux-clang.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: Linux Clang

on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:
on: [push, pull_request, workflow_dispatch]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -17,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +22,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: clang@18
+: clang@19

- run: clang --version

Expand Down
14 changes: 4 additions & 10 deletions .github/workflows/linux-gcc.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: Linux GCC

on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:
on: [push, pull_request, workflow_dispatch]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -17,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +22,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup GCC
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: gcc@13
+: gcc@14

- run: gcc --version

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +28,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: clang@17
+: clang@19

- run: clang --version

Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
name: macOS

on:
push:
branches:
- main
- develop
pull_request:
workflow_dispatch:
on: [workflow_dispatch]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: macos-13
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/msan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +28,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: clang@17
+: clang@19

- run: clang --version

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
- main
- develop
pull_request:
branches:
- main
- develop
workflow_dispatch:

concurrency:
Expand All @@ -22,7 +19,7 @@ jobs:
env:
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -32,14 +29,14 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache lcov
- name: Setup GCC
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: gcc@13
+: gcc@14

- run: gcc --version

- name: Install sonar-scanner and build-wrapper
uses: sonarsource/sonarcloud-github-c-cpp@v2
uses: sonarsource/sonarcloud-github-c-cpp@v3

- name: Restore artifacts or setup vcpkg
uses: lukka/run-vcpkg@v11
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tsan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
Expand All @@ -28,9 +28,9 @@ jobs:
sudo apt-get install build-essential automake autoconf autoconf-archive texinfo libtool-bin yasm ninja-build ccache
- name: Setup Clang
uses: pkgxdev/setup@v1
uses: pkgxdev/setup@v2
with:
+: clang@17
+: clang@19

- run: clang --version

Expand Down
Loading

0 comments on commit bec7526

Please sign in to comment.