macOS CI: Upgrade GNU make in ci/cirrusci.sh (#17034)

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.
This commit is contained in:
Martin Kinkelin 2024-10-27 14:27:05 +01:00 committed by GitHub
parent 6c09f58feb
commit dbba866c71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions

View file

@ -115,11 +115,6 @@ jobs:
uses: dlang-community/setup-dlang@v1.3.0 uses: dlang-community/setup-dlang@v1.3.0
with: with:
compiler: ${{ matrix.host_dmd }} 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 - name: Set up repos
run: | run: |

View file

@ -27,6 +27,10 @@ if [ "$OS_NAME" == "linux" ]; then
fi fi
apt-get -q update apt-get -q update
apt-get install -yq $packages apt-get install -yq $packages
elif [ "$OS_NAME" == "osx" ]; then
# upgrade GNU make
brew install make
sudo ln -s /usr/local/opt/make/libexec/gnubin/make /usr/local/bin/make
elif [ "$OS_NAME" == "freebsd" ]; then elif [ "$OS_NAME" == "freebsd" ]; then
packages="git gmake devel/llvm12" packages="git gmake devel/llvm12"
if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then if [ "$HOST_DMD" == "dmd-2.079.0" ] ; then