From 895481c3598ff35008fee1415939719901a50bce Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 15:23:48 +0100 Subject: [PATCH 01/10] Add GCC14/Linux to CI test matrix --- .github/workflows/linux.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1124022a..5572fd29 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - compiler: [GCC-11, GCC-12, GCC-13, Clang-17] + compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17] test_with: [Headers, Module] build_type: [Debug, Release] @@ -22,6 +22,8 @@ jobs: test_with: Module - compiler: GCC-13 test_with: Module + - compiler: GCC-14 + test_with: Module include: - compiler: GCC-11 @@ -39,6 +41,11 @@ jobs: install: | brew install gcc@13 ninja binutils brew link --force binutils + - compiler: GCC-14 + cxx: g++-14 + install: | + brew install gcc@14 ninja binutils + brew link --force binutils - compiler: Clang-17 cxx: $(brew --prefix llvm@17)/bin/clang++ install: | From cc6d1948e38a54533c6dfc37a3c00f5e0b0b460f Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 15:42:15 +0100 Subject: [PATCH 02/10] Add GCC14/macos to CI test matrix --- .github/workflows/macos.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 01fb409e..063544ee 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,22 +14,22 @@ jobs: runs-on: macos-latest strategy: matrix: - compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17] + compiler: [GCC-14, LLVM-Clang-16, LLVM-Clang-17] test_with: [Headers, Module] build_type: [Debug, Release] exclude: - - compiler: GCC-13 - # test_with: Module + - compiler: GCC-14 + test_with: Module - compiler: LLVM-Clang-16 test_with: Module include: - # - compiler: GCC-13 - # cxx: g++-13 - # install: | - # brew update - # brew install gcc@13 ninja + - compiler: GCC-14 + cxx: g++-14 + install: | + brew update + brew install gcc@14 ninja - compiler: LLVM-Clang-16 cxx: $(brew --prefix llvm@16)/bin/clang++ install: | From 8e4a6c34abc6e92553a5b219924f285085f77259 Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 15:52:48 +0100 Subject: [PATCH 03/10] Revert "Add GCC14/macos to CI test matrix" This reverts commit cc6d1948e38a54533c6dfc37a3c00f5e0b0b460f. --- .github/workflows/macos.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 063544ee..01fb409e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,22 +14,22 @@ jobs: runs-on: macos-latest strategy: matrix: - compiler: [GCC-14, LLVM-Clang-16, LLVM-Clang-17] + compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17] test_with: [Headers, Module] build_type: [Debug, Release] exclude: - - compiler: GCC-14 - test_with: Module + - compiler: GCC-13 + # test_with: Module - compiler: LLVM-Clang-16 test_with: Module include: - - compiler: GCC-14 - cxx: g++-14 - install: | - brew update - brew install gcc@14 ninja + # - compiler: GCC-13 + # cxx: g++-13 + # install: | + # brew update + # brew install gcc@13 ninja - compiler: LLVM-Clang-16 cxx: $(brew --prefix llvm@16)/bin/clang++ install: | From b45e5db4e097c87d2bf6c765a0f776667f059749 Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 15:54:05 +0100 Subject: [PATCH 04/10] Add Clang18/Linux to CI test matrix --- .github/workflows/linux.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5572fd29..0c805e5b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17] + compiler: [GCC-11, GCC-12, GCC-13, GCC-14, Clang-17, Clang-18] test_with: [Headers, Module] build_type: [Debug, Release] @@ -51,6 +51,11 @@ jobs: install: | brew install llvm@17 ninja binutils brew link --force binutils + - compiler: Clang-18 + cxx: $(brew --prefix llvm@18)/bin/clang++ + install: | + brew install llvm@18 ninja binutils + brew link --force binutils steps: - uses: actions/checkout@master From ea00704d9c57e978d84796dcb677b24e36747c2e Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 15:55:19 +0100 Subject: [PATCH 05/10] Add Clang18/macos to CI test matrix --- .github/workflows/macos.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 01fb409e..3100679f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,7 +14,7 @@ jobs: runs-on: macos-latest strategy: matrix: - compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17] + compiler: [GCC-13, LLVM-Clang-16, LLVM-Clang-17, LLVM-Clang-18] test_with: [Headers, Module] build_type: [Debug, Release] @@ -38,6 +38,10 @@ jobs: cxx: $(brew --prefix llvm@17)/bin/clang++ install: | brew install llvm@17 ninja + - compiler: LLVM-Clang-18 + cxx: $(brew --prefix llvm@18)/bin/clang++ + install: | + brew install llvm@18 ninja steps: From 6b28474a7c3935b4fad8e89dd882294b4572e30f Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 16:09:58 +0100 Subject: [PATCH 06/10] Update various CI tools to use GCC 14 --- .github/workflows/codecov.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/generate-single-header.yml | 4 ++-- .github/workflows/santizers.yml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index d2401513..6cc11350 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -21,11 +21,11 @@ jobs: - name: Build run: | - brew install gcc@13 lcov ninja binutils + brew install gcc@14 lcov ninja binutils brew link --force binutils cmake -E make_directory ${{runner.workspace}}/build cd ${{runner.workspace}}/build - cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-13 -DCMAKE_CXX_FLAGS="--coverage" -DCMAKE_EXE_LINKER_FLAGS="--coverage" + cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_CXX_FLAGS="--coverage" -DCMAKE_EXE_LINKER_FLAGS="--coverage" cmake --build . - name: Run tests @@ -35,7 +35,7 @@ jobs: - name: Generate coverage report working-directory: ${{runner.workspace}}/build/test/CMakeFiles/test-flux.dir run: | - lcov --directory . --capture --gcov gcov-13 --output-file coverage.info + lcov --directory . --capture --gcov gcov-14 --output-file coverage.info lcov --remove coverage.info '*/test/*' --output-file coverage.info - name: Upload coverage report diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 58faa1a7..9ca50f06 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support include: - install: | - brew install gcc@13 ninja binutils + brew install gcc@14 ninja binutils brew link --force binutils steps: @@ -78,7 +78,7 @@ jobs: ${{matrix.install}} cmake -E make_directory ${{runner.workspace}}/build cd ${{runner.workspace}}/build - cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-13 + cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-14 cmake --build . diff --git a/.github/workflows/generate-single-header.yml b/.github/workflows/generate-single-header.yml index f2aa54c9..454e156d 100644 --- a/.github/workflows/generate-single-header.yml +++ b/.github/workflows/generate-single-header.yml @@ -24,11 +24,11 @@ jobs: - name: Build run: | - brew install gcc@13 binutils + brew install gcc@14 binutils brew link --force binutils cmake -E make_directory ${{runner.workspace}}/build cd ${{runner.workspace}}/build - cmake ${GITHUB_WORKSPACE} -DCMAKE_CXX_COMPILER=g++-13 -DFLUX_BUILD_TOOLS=On + cmake ${GITHUB_WORKSPACE} -DCMAKE_CXX_COMPILER=g++-14 -DFLUX_BUILD_TOOLS=On cmake --build . --target make_single_header - name: Run diff --git a/.github/workflows/santizers.yml b/.github/workflows/santizers.yml index cc812ae0..7b967262 100644 --- a/.github/workflows/santizers.yml +++ b/.github/workflows/santizers.yml @@ -13,9 +13,9 @@ jobs: matrix: sanitizer: [ubsan, asan] include: - - cxx: g++-13 + - cxx: g++-14 install: | - brew install gcc@13 ninja binutils + brew install gcc@14 ninja binutils brew link --force binutils steps: @@ -35,7 +35,7 @@ jobs: cmake -GNinja \ -DFLUX_ENABLE_ASAN=${{matrix.sanitizer == 'asan'}} \ -DFLUX_ENABLE_UBSAN=${{matrix.sanitizer == 'ubsan'}} \ - -DCMAKE_CXX_COMPILER=g++-13 \ + -DCMAKE_CXX_COMPILER=g++-14 \ $GITHUB_WORKSPACE - name: Build From fa53c8f6a487d539dbda9dbd0a9a186d850693cf Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 16:23:46 +0100 Subject: [PATCH 07/10] Fix CodeCov uploading Update to upload action v4, add a security token --- .github/workflows/codecov.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6cc11350..c4a3d126 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -39,7 +39,9 @@ jobs: lcov --remove coverage.info '*/test/*' --output-file coverage.info - name: Upload coverage report - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: ${{runner.workspace}}/build/test/CMakeFiles/test-flux.dir/coverage.info + token: ${{secrets.CODECOV_TOKEN}} + verbose: true From 5e0e8e481a716269ab63bcff23e7bc56503f33c4 Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 16:48:24 +0100 Subject: [PATCH 08/10] Update CodeQL GH action to v3 --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9ca50f06..44593869 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -49,7 +49,7 @@ jobs: # 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. @@ -83,4 +83,4 @@ jobs: - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From b4cd32313e032ffb254acf13cb89f2525fde1838 Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 17:03:35 +0100 Subject: [PATCH 09/10] Revert to GCC13 for CodeQL scanning For some reason, our CodeQL action with GCC14 hangs at the point it's trying to compile `test_mask.cpp`. I have no idea why, given the same compiler works fine with our Linux CI, but as a workaround we'll try going back to GCC 14 and see whether that works. --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 44593869..6967e27f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -37,7 +37,7 @@ jobs: # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support include: - install: | - brew install gcc@14 ninja binutils + brew install gcc@13 ninja binutils brew link --force binutils steps: @@ -78,7 +78,7 @@ jobs: ${{matrix.install}} cmake -E make_directory ${{runner.workspace}}/build cd ${{runner.workspace}}/build - cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-14 + cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-13 cmake --build . From 1524122c7862fc6a64c4d04c0096407e52a4d25b Mon Sep 17 00:00:00 2001 From: Tristan Brindle Date: Mon, 3 Jun 2024 17:45:25 +0100 Subject: [PATCH 10/10] Attempt to use CodeQL autobuild ...on Ubuntu 24.04, which should come with a new enough GCC by default --- .github/workflows/codeql-analysis.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6967e27f..7dbc789e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: actions: read contents: read @@ -35,18 +35,11 @@ jobs: language: [ 'cpp' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support - include: - - install: | - brew install gcc@13 ninja binutils - brew link --force binutils steps: - name: Checkout repository uses: actions/checkout@master - - name: Set up Homebrew - uses: Homebrew/actions/setup-homebrew@master - # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 @@ -62,8 +55,8 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - #- name: Autobuild - # uses: github/codeql-action/autobuild@v2 + - name: Autobuild + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -74,12 +67,12 @@ jobs: # - run: | # echo "Run, Build Application using script" # ./location_of_script_within_repo/buildscript.sh - - run: | - ${{matrix.install}} - cmake -E make_directory ${{runner.workspace}}/build - cd ${{runner.workspace}}/build - cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-13 - cmake --build . + #- run: | + # ${{matrix.install}} + # cmake -E make_directory ${{runner.workspace}}/build + # cd ${{runner.workspace}}/build + # cmake ${GITHUB_WORKSPACE} -GNinja -DCMAKE_CXX_COMPILER=g++-13 + # cmake --build . - name: Perform CodeQL Analysis