mirror of https://github.com/rusefi/rusefi.git
Did master just break by itself? requiring macos-12 #6405
This commit is contained in:
parent
d470a67d33
commit
f6aa78b72e
|
@ -4,7 +4,7 @@ on: [push,pull_request]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: macos-latest
|
runs-on: macos-12
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/setup-java@v4
|
- uses: actions/setup-java@v4
|
||||||
|
|
|
@ -8,7 +8,7 @@ jobs:
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-latest, macos-latest]
|
os: [ubuntu-latest, macos-12]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -23,17 +23,17 @@ jobs:
|
||||||
git submodule update --init --depth=1 java_console/peak-can-basic
|
git submodule update --init --depth=1 java_console/peak-can-basic
|
||||||
|
|
||||||
- name: Discover cores
|
- name: Discover cores
|
||||||
if: ${{ matrix.os != 'macos-latest' }}
|
if: ${{ matrix.os != 'macos-12' }}
|
||||||
run: lscpu | egrep 'Model name|Socket|Thread|NUMA|CPU\(s\)'
|
run: lscpu | egrep 'Model name|Socket|Thread|NUMA|CPU\(s\)'
|
||||||
|
|
||||||
- name: Install required software (ubuntu)
|
- name: Install required software (ubuntu)
|
||||||
if: ${{ matrix.os != 'macos-latest' }}
|
if: ${{ matrix.os != 'macos-12' }}
|
||||||
run: |
|
run: |
|
||||||
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
sudo bash misc/actions/add-ubuntu-latest-apt-mirrors.sh
|
||||||
sudo apt-get install mtools zip dosfstools sshpass lcov valgrind
|
sudo apt-get install mtools zip dosfstools sshpass lcov valgrind
|
||||||
|
|
||||||
- name: Install required software (macos)
|
- name: Install required software (macos)
|
||||||
if: ${{ matrix.os == 'macos-latest' }}
|
if: ${{ matrix.os == 'macos-12' }}
|
||||||
run: |
|
run: |
|
||||||
brew install mtools zip dosfstools flock coreutils
|
brew install mtools zip dosfstools flock coreutils
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ jobs:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Generate Code Coverage
|
- 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/
|
working-directory: ./unit_tests/
|
||||||
run: ./ci_gcov.sh ${{ secrets.RUSEFI_SSH_USER }} ${{ secrets.RUSEFI_SSH_PASS }} ${{ secrets.RUSEFI_SSH_SERVER }}
|
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
|
- name: Rebuild Tests For Valgrind
|
||||||
# Valgrind isn't compatible with address sanitizer, so we have to rebuild the code
|
# 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/
|
working-directory: ./unit_tests/
|
||||||
run: |
|
run: |
|
||||||
make clean
|
make clean
|
||||||
make -j4 SANITIZE=no
|
make -j4 SANITIZE=no
|
||||||
|
|
||||||
- name: Run Tests (Valgrind)
|
- name: Run Tests (Valgrind)
|
||||||
if: ${{ matrix.os != 'macos-latest' }}
|
if: ${{ matrix.os != 'macos-12' }}
|
||||||
working-directory: ./unit_tests/
|
working-directory: ./unit_tests/
|
||||||
run: valgrind --error-exitcode=1 --exit-on-first-error=yes --leak-check=no --show-error-list=yes build/rusefi_test
|
run: valgrind --error-exitcode=1 --exit-on-first-error=yes --leak-check=no --show-error-list=yes build/rusefi_test
|
||||||
|
|
Loading…
Reference in New Issue