diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 4b6c5d1d..1477f97a 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -186,7 +186,6 @@ jobs: build-${{ matrix.config.os }}-${{ matrix.build_type }}-${{ matrix.config.compiler.type }}- build-${{ matrix.config.os }}-${{ matrix.build_type }}- build-${{ matrix.config.os }}- - - uses: hendrikmuhs/ccache-action@v1.2 if: runner.os == 'Linux' with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 51d6144b..0a8c8b98 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -25,7 +25,7 @@ on: jobs: analyze: name: Analyze - runs-on: ${{ env.OS }} + runs-on: ${{ OS }} env: CC: gcc-10 CXX: g++-10 @@ -72,13 +72,13 @@ jobs: cache-name: cache-conan-data with: path: ~/.conan/data - key: build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} + key: build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}-${{ STDLIB }} restore-keys: | - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}- - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}- - build-${{ env.OS }}-${{ env.BUILD_TYPE }}- - build-${{ env.OS }}- + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}-${{ STDLIB }} + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}- + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}- + build-${{ OS }}-${{ BUILD_TYPE }}- + build-${{ OS }}- - name: Set up Python if: matrix.language == 'cpp' uses: actions/setup-python@v4 @@ -91,7 +91,7 @@ jobs: conan config init conan remote add upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss mkdir _lgtm_build_dir && cd _lgtm_build_dir - conan install .. -s compiler.cppstd=20 -s compiler.libcxx=${{ env.STDLIB }} -c user.build:all=True -c user.build:skip_docs=True -b outdated -u + conan install .. -s compiler.cppstd=20 -s compiler.libcxx=${{ STDLIB }} -c user.build:all=True -c user.build:skip_docs=True -b outdated -u conan build .. - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b2d8bc23..94ecc93d 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -49,7 +49,7 @@ env: jobs: docs: name: Generate documentation - runs-on: ${{ env.OS }} + runs-on: ${{ OS }} steps: - uses: actions/checkout@v3 - name: Cache Conan data @@ -58,13 +58,13 @@ jobs: cache-name: cache-conan-data with: path: ~/.conan/data - key: build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} + key: build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}-${{ STDLIB }} restore-keys: | - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}-${{ env.STDLIB }} - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}-${{ env.COMPILER_VERSION }}- - build-${{ env.OS }}-${{ env.BUILD_TYPE }}-${{ env.COMPILER_TYPE }}- - build-${{ env.OS }}-${{ env.BUILD_TYPE }}- - build-${{ env.OS }}- + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}-${{ STDLIB }} + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}-${{ COMPILER_VERSION }}- + build-${{ OS }}-${{ BUILD_TYPE }}-${{ COMPILER_TYPE }}- + build-${{ OS }}-${{ BUILD_TYPE }}- + build-${{ OS }}- - name: Install Ninja run: | sudo apt install -y ninja-build @@ -84,7 +84,7 @@ jobs: conan remote add -i 0 upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss - name: Install Conan dependencies run: | - conan install . -s compiler.cppstd=20 -s compiler.libcxx=${{ env.STDLIB }} -c user.build:all=True -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -b outdated -u + conan install . -s compiler.cppstd=20 -s compiler.libcxx=${{ STDLIB }} -c user.build:all=True -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -b outdated -u - name: Configure CMake run: | cmake --preset default