Skip to content

Commit

Permalink
Merge branch 'github-macos-runners-update'
Browse files Browse the repository at this point in the history
  • Loading branch information
matejk committed Oct 7, 2024
2 parents 3b79a51 + 568f325 commit 13bbea7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ jobs:
make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf
macos-clang-make:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- run: brew install [email protected] mysql-client unixodbc libpq
Expand Down Expand Up @@ -268,8 +268,8 @@ jobs:
./ci/runtests.sh
macos-clang-make-visibility-hidden:
# macos-12 runs on Intel CPU
runs-on: macos-12
# macos-13 runs on Intel CPU
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- run: brew install [email protected] mysql-client unixodbc libpq
Expand Down Expand Up @@ -299,8 +299,8 @@ jobs:
./ci/runtests.sh
macos-clang-cmake-openssl:
# macos-14 runs on Apple Silicon
runs-on: macos-14
# macos-latest runs on Apple Silicon
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- run: brew install [email protected] mysql-client unixodbc libpq
Expand All @@ -325,7 +325,7 @@ jobs:
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
macos-clang-cmake-openssl3:
runs-on: macos-14
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- run: brew install openssl@3 mysql-client unixodbc libpq
Expand All @@ -350,7 +350,7 @@ jobs:
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
macos-clang-cmake-openssl3-visibility-hidden:
runs-on: macos-14
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- run: brew install openssl@3 mysql-client unixodbc libpq
Expand All @@ -375,7 +375,7 @@ jobs:
ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)"
macos-clang-make-openssl3-tsan:
runs-on: macos-14
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- run: brew install openssl@3
Expand Down Expand Up @@ -405,7 +405,7 @@ jobs:
./ci/runtests.sh TSAN
macos-clang-make-openssl3-ubsan:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- run: brew install openssl@3 mysql-client unixodbc libpq
Expand Down Expand Up @@ -435,7 +435,7 @@ jobs:
./ci/runtests.sh
macos-clang-make-openssl3-asan:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- run: brew install openssl@3 mysql-client unixodbc libpq
Expand Down

0 comments on commit 13bbea7

Please sign in to comment.