From 73cb4c749b2130f22d93f30b0c15a8becf810376 Mon Sep 17 00:00:00 2001 From: Jan Henke Date: Sat, 21 Dec 2024 12:54:56 +0100 Subject: [PATCH] More GH action fixes --- .github/workflows/cmake-macos.yaml | 11 ++++++++++- .github/workflows/cmake-ubuntu.yaml | 13 +++++++++++-- .github/workflows/cmake-windows.yaml | 8 +++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-macos.yaml b/.github/workflows/cmake-macos.yaml index b64b002..4423318 100644 --- a/.github/workflows/cmake-macos.yaml +++ b/.github/workflows/cmake-macos.yaml @@ -17,11 +17,20 @@ jobs: fail-fast: false matrix: - build_type: [Debug, Release] + build_type: [ Debug, Release ] steps: + - uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + - uses: actions/checkout@v4 + - name: Install ninja + run: brew install ninja + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type diff --git a/.github/workflows/cmake-ubuntu.yaml b/.github/workflows/cmake-ubuntu.yaml index d17d413..9b00ab3 100644 --- a/.github/workflows/cmake-ubuntu.yaml +++ b/.github/workflows/cmake-ubuntu.yaml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: - build_type: [Debug, Release] - toolchain: [GNU, LLVM] + build_type: [ Debug, Release ] + toolchain: [ GNU, LLVM ] include: - toolchain: GNU c_compiler: gcc @@ -28,8 +28,17 @@ jobs: cpp_compiler: clang++ steps: + - uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + - uses: actions/checkout@v4 + - name: Install ninja + run: apt install ninja + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type diff --git a/.github/workflows/cmake-windows.yaml b/.github/workflows/cmake-windows.yaml index f4bd26e..4fdfce7 100644 --- a/.github/workflows/cmake-windows.yaml +++ b/.github/workflows/cmake-windows.yaml @@ -17,9 +17,15 @@ jobs: fail-fast: false matrix: - build_type: [Debug, Release] + build_type: [ Debug, Release ] steps: + - uses: actions/github-script@v6 + with: + script: | + core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); + core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); + - uses: actions/checkout@v4 - name: Install pkg-config on Windows