diff --git a/.github/workflows/cmake_macos.yml b/.github/workflows/cmake_macos.yml index 45b5f2f3e..5a6a26752 100644 --- a/.github/workflows/cmake_macos.yml +++ b/.github/workflows/cmake_macos.yml @@ -43,7 +43,7 @@ jobs: ${{ runner.os }}-pip- - name: Clone PHARE - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' diff --git a/.github/workflows/cmake_ubuntu.yml b/.github/workflows/cmake_ubuntu.yml index 5da4b0955..504fa2949 100644 --- a/.github/workflows/cmake_ubuntu.yml +++ b/.github/workflows/cmake_ubuntu.yml @@ -15,6 +15,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] + cc: [gcc, clang] steps: - name: Build Info @@ -40,7 +41,7 @@ jobs: ${{ runner.os }}-pip- - name: Clone PHARE - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: 'recursive' @@ -68,10 +69,11 @@ jobs: run: cmake -E make_directory ${{runner.workspace}}/build - name: Configure CMake - # builds samrai with 2 threads as it does not OOM (yet) working-directory: ${{runner.workspace}}/build run: | set -ex + export CC=gcc CXX=g++ + [ "${{ matrix.cc }}" = "clang" ] && export CC=clang CXX=clang++ cmake $GITHUB_WORKSPACE cd ${{runner.workspace}}/PHARE/subprojects/samrai && mkdir build && cd build cmake .. -DENABLE_SAMRAI_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -86,8 +88,7 @@ jobs: - name: Build working-directory: ${{runner.workspace}}/build - run: | - cmake --build . # OOM if more threads + run: cmake --build . -j 2 - name: Test working-directory: ${{runner.workspace}}/build diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e45ae0ea9..76318cbed 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -38,14 +38,14 @@ jobs: run: mkdir build; cd build; cmake .. -Dphare_configurator=ON - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: config-file: ./.github/codeql-config.yml languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 if: ${{ matrix.language == 'python' }} - name: Build cpp @@ -53,6 +53,6 @@ jobs: run: cd build; make - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{ matrix.language }}" diff --git a/tests/amr/data/particles/copy/test_particledata_copyNd.cpp b/tests/amr/data/particles/copy/test_particledata_copyNd.cpp index 86ce92e6d..2e0b3531f 100644 --- a/tests/amr/data/particles/copy/test_particledata_copyNd.cpp +++ b/tests/amr/data/particles/copy/test_particledata_copyNd.cpp @@ -142,7 +142,7 @@ TYPED_TEST(AParticlesDataND, PreservesAllParticleAttributesAfterCopy) TYPED_TEST(AParticlesDataND, copiesDataWithOverlapNoTransform) { static constexpr auto dim = TypeParam{}(); - auto dimension = SAMRAI::tbox::Dimension{this->dim}; + auto dimension = SAMRAI::tbox::Dimension{dim}; // now, with an overlap as union of 2 boxes //