aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorGravatar Sadie Powell2024-05-16 20:02:54 +0100
committerGravatar Sadie Powell2024-05-16 20:36:33 +0100
commitdac4b23df7f81864b53dec0debf284534b9274a9 (patch)
tree12683589393db61e98facbcb4b545ebb5f2491c8 /.github
parentDeallocate the old MySQL connection on connect if one exists. (diff)
Fix building on macOS.
It seems like Apple have killed the remaining bits of TR1. Thankfully, all Apple systems we support now have a C++11 compiler so we can just force that on macOS. [skip alpine ci] [skip irctest ci] [skip ubuntu ci] [skip windows ci]
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci-macos.yml12
1 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 854b4e11b..c1f9c775a 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -9,7 +9,6 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip macos ci]')"
runs-on: macos-latest
env:
- CXXFLAGS: -std=${{ matrix.standard }} -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALL_CLEANUP: 1
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
@@ -17,6 +16,11 @@ jobs:
steps:
- uses: actions/checkout@v4
+ - name: Prepare the build environment
+ run: |
+ echo "CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
+ echo "LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
+
- name: Install dependencies
run: |
brew update || true
@@ -39,9 +43,3 @@ jobs:
- name: Run test-build
run: ./tools/test-build c++
- strategy:
- fail-fast: false
- matrix:
- standard:
- - gnu++98
- - c++17