From f6aa78b72e97879223a6f707b753896c8b5e4f7a Mon Sep 17 00:00:00 2001 From: rusEFI LLC Date: Wed, 24 Apr 2024 10:45:47 -0400 Subject: [PATCH] Did master just break by itself? requiring macos-12 #6405 --- .../workflows/build-firmware-proteus-f7-mac.yaml | 2 +- .github/workflows/build-unit-tests.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-firmware-proteus-f7-mac.yaml b/.github/workflows/build-firmware-proteus-f7-mac.yaml index 8ce7005838..4e8fb8c684 100644 --- a/.github/workflows/build-firmware-proteus-f7-mac.yaml +++ b/.github/workflows/build-firmware-proteus-f7-mac.yaml @@ -4,7 +4,7 @@ on: [push,pull_request] jobs: build: - runs-on: macos-latest + runs-on: macos-12 steps: - uses: actions/setup-java@v4 diff --git a/.github/workflows/build-unit-tests.yaml b/.github/workflows/build-unit-tests.yaml index 9442445f97..ab23ab1cd1 100644 --- a/.github/workflows/build-unit-tests.yaml +++ b/.github/workflows/build-unit-tests.yaml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-12] steps: - uses: actions/checkout@v4 @@ -23,17 +23,17 @@ jobs: git submodule update --init --depth=1 java_console/peak-can-basic - name: Discover cores - if: ${{ matrix.os != 'macos-latest' }} + if: ${{ matrix.os != 'macos-12' }} run: lscpu | egrep 'Model name|Socket|Thread|NUMA|CPU\(s\)' - name: Install required software (ubuntu) - if: ${{ matrix.os != 'macos-latest' }} + if: ${{ matrix.os != 'macos-12' }} run: | sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh sudo apt-get install mtools zip dosfstools sshpass lcov valgrind - name: Install required software (macos) - if: ${{ matrix.os == 'macos-latest' }} + if: ${{ matrix.os == 'macos-12' }} run: | brew install mtools zip dosfstools flock coreutils @@ -74,7 +74,7 @@ jobs: fi - name: Generate Code Coverage - if: ${{ matrix.os != 'macos-latest' && github.event_name == 'push' && github.ref == 'refs/heads/master' }} + if: ${{ matrix.os != 'macos-12' && github.event_name == 'push' && github.ref == 'refs/heads/master' }} working-directory: ./unit_tests/ run: ./ci_gcov.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }} @@ -85,13 +85,13 @@ jobs: - name: Rebuild Tests For Valgrind # Valgrind isn't compatible with address sanitizer, so we have to rebuild the code - if: ${{ matrix.os != 'macos-latest' }} + if: ${{ matrix.os != 'macos-12' }} working-directory: ./unit_tests/ run: | make clean make -j4 SANITIZE=no - name: Run Tests (Valgrind) - if: ${{ matrix.os != 'macos-latest' }} + if: ${{ matrix.os != 'macos-12' }} working-directory: ./unit_tests/ run: valgrind --error-exitcode=1 --exit-on-first-error=yes --leak-check=no --show-error-list=yes build/rusefi_test