From 93e2daced8ee623018a5233e9dfdd53f84017814 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 6 Jan 2023 16:20:12 +0000 Subject: [PATCH 1/5] Environment variable acccess does not require env prefix --- .github/workflows/codeql-analysis.yml | 12 ++++++------ .github/workflows/documentation.yml | 24 +++++++++++++++++------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 51d6144b..2a7f775e 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b2d8bc23..2112defe 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -49,7 +49,17 @@ env: jobs: docs: name: Generate documentation - runs-on: ${{ env.OS }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ "ubuntu-22.04" ] + build_type: [ "Debug" ] + compiler: + - { + type: GCC, + version: "10", + lib: libstdc++11 + } steps: - uses: actions/checkout@v3 - name: Cache Conan data @@ -58,13 +68,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 From b028f76664f323b1715e43cb7abd5dae37bc2519 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 6 Jan 2023 16:33:24 +0000 Subject: [PATCH 2/5] Remove matrix values --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/documentation.yml | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2a7f775e..8c8b85c1 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 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 2112defe..afbc4026 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -49,17 +49,7 @@ env: jobs: docs: name: Generate documentation - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ "ubuntu-22.04" ] - build_type: [ "Debug" ] - compiler: - - { - type: GCC, - version: "10", - lib: libstdc++11 - } + runs-on: ${{ OS }} steps: - uses: actions/checkout@v3 - name: Cache Conan data From 10df364407d13aed698ec4ae20e5d59004674bb4 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 6 Jan 2023 16:35:44 +0000 Subject: [PATCH 3/5] Missing env --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/documentation.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 8c8b85c1..0a8c8b98 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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 afbc4026..77c70a41 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -29,7 +29,7 @@ on: - "docs/**" - "src/**" - "example/**" - pull_request: + pull_request:STDLIB paths: - ".github/workflows/documentation.yml" - "docs/**" @@ -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 From c677264e44eef0b2698dfc196963bcfc13bd2422 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 6 Jan 2023 16:49:48 +0000 Subject: [PATCH 4/5] Syntax fix --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 77c70a41..94ecc93d 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -29,7 +29,7 @@ on: - "docs/**" - "src/**" - "example/**" - pull_request:STDLIB + pull_request: paths: - ".github/workflows/documentation.yml" - "docs/**" From c786ae1e47c5ae6d947f72cad3dedc43ae3256d9 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Fri, 6 Jan 2023 17:07:17 +0000 Subject: [PATCH 5/5] Whitespace fix --- .github/workflows/ci-conan.yml | 1 - 1 file changed, 1 deletion(-) 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: