Skip to content

Commit

Permalink
macOS CI: Upgrade GNU make in ci/cirrusci.sh
Browse files Browse the repository at this point in the history
This should fix Phobos CI, which expects such prerequisites provisioning
to happen in DMD's ci/cirrusci.sh. Because this YAML addition hasn't been
duplicated in Phobos, Phobos CI is still using the default make on macOS,
which is too old and doesn't support the newly required `private` modifier.
  • Loading branch information
kinke committed Oct 27, 2024
1 parent 6c09f58 commit 152946e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ jobs:
uses: dlang-community/setup-dlang@v1.3.0
with:
compiler: ${{ matrix.host_dmd }}
- name: 'MacOS: Install recent make'
if: runner.os == 'macOS'
run: |
brew install make
echo "PATH=/usr/local/opt/make/libexec/gnubin:$PATH" >> $GITHUB_ENV

- name: Set up repos
run: |
Expand Down
5 changes: 5 additions & 0 deletions ci/cirrusci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ if [ "$OS_NAME" == "linux" ]; then
fi
apt-get -q update
apt-get install -yq $packages
elif [ "$OS_NAME" == "osx" ]; then
# update GNU make
brew install make
rm /usr/bin/make
ln -s /usr/local/opt/make/libexec/gnubin/make /usr/bin/make
elif [ "$OS_NAME" == "freebsd" ]; then
packages="git gmake devel/llvm12"
if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then
Expand Down

0 comments on commit 152946e

Please sign in to comment.