From f8704b514dca22bfa6cfacbddbb5de9319cd65a4 Mon Sep 17 00:00:00 2001 From: Ian Duncan <76043277+dr8co@users.noreply.github.com> Date: Fri, 14 Jun 2024 03:46:29 +0300 Subject: [PATCH] CI env bug fix --- .github/workflows/cmake-multi-platform.yml | 5 +++-- .github/workflows/cpack-multi-platform.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 97d49cd..7e10413 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -7,6 +7,8 @@ on: jobs: build: runs-on: ${{ matrix.os }} + env: + GCC_MAJOR: 14 strategy: fail-fast: false @@ -19,8 +21,6 @@ jobs: - os: macos-latest c_compiler: clang cpp_compiler: clang++-18 - env: - GCC_MAJOR: 14 - os: ubuntu-24.04 c_compiler: clang @@ -30,6 +30,7 @@ jobs: - name: Install Dependencies if: matrix.os == 'macos-latest' run: | + echo "GCC_MAJOR: ${{ env.GCC_MAJOR }}" export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE brew update brew install ninja cmake git "gcc@${{ env.GCC_MAJOR }}" diff --git a/.github/workflows/cpack-multi-platform.yml b/.github/workflows/cpack-multi-platform.yml index a5f3448..f09123d 100644 --- a/.github/workflows/cpack-multi-platform.yml +++ b/.github/workflows/cpack-multi-platform.yml @@ -7,6 +7,8 @@ on: jobs: build_then_package: runs-on: ${{ matrix.os }} + env: + GCC_MAJOR: 14 strategy: fail-fast: false @@ -19,8 +21,6 @@ jobs: - os: macos-latest c_compiler: clang cpp_compiler: clang++-18 - env: - GCC_MAJOR: 14 - os: ubuntu-24.04 c_compiler: clang