Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump macos versions used in CI #2513

Merged
merged 1 commit into from
Oct 22, 2024
+6 −17
Merged

chore: bump macos versions used in CI #2513

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions .github/workflows/CI-Tests.yml
View file
Original file line number Diff line number Diff line change
@@ -113,15 +113,9 @@ jobs:
matrix:
chunk: ${{ fromJSON(needs.Test-Setup.outputs.chunks) }}

runs-on: macos-12
runs-on: macos-13

steps:
- name: Select XCode version
uses: maxim-lobanov/setup-xcode@v1
with:
# Pending https://github.com/actions/runner-images/issues/6350
xcode-version: '13.4'

- name: checkout
uses: actions/checkout@v4

@@ -146,14 +140,9 @@ jobs:
matrix:
chunk: ${{ fromJSON(needs.Test-Setup.outputs.chunks) }}

runs-on: macos-14
runs-on: macos-15

steps:
- name: Select XCode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.2'

- name: checkout
uses: actions/checkout@v4

8 changes: 4 additions & 4 deletions sh/setup/install_macos_deps.sh
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@ set -x

# Install requirements of MAC OS X
brew install bison libtool mcpp libffi swig
brew install gcc@10
brew link gcc@10
brew install gcc@12
brew link gcc@12

echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
echo 'PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig/"' >> $GITHUB_ENV
echo 'CC=gcc-10' >> $GITHUB_ENV
echo 'CXX=g++-10' >> $GITHUB_ENV
echo 'CC=gcc-12' >> $GITHUB_ENV
echo 'CXX=g++-12' >> $GITHUB_ENV

set +e
set +x

Unchanged files with check annotations Beta

View file
CMakeLists.txt
# If building from a shallow clone where tag is not available.
if (NOT ${SOUFFLE_VERSION} MATCHES "^[0-9.]+$")
message(WARNING "Cannot find a valid tag: cmake project version will be incomplete")

Check warning on line 43 in CMakeLists.txt

GitHub Actions / Windows-CMake-MSVC 

Cannot find a valid tag: cmake project version will be incomplete
set (SOUFFLE_VERSION "")
endif()
endif()