From ce2a66c52886954ff49ab6f49b1320a465f7db50 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 14 Jul 2024 04:36:48 +0000 Subject: [PATCH] Update `ci.yml`. --- .github/workflows/ci.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b72f69c..d4c29cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: run: | if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]] then - brew ruby -- "$(brew --repository homebrew/cask)/cmd/lib/generate-matrix.rb" ${{ github.event.inputs.skip_install && '--skip-install' }} ${{ github.event.inputs.new_cask && '--new' }} --casks=${{ github.event.inputs.casks }} + brew ruby -- "$(brew --repository homebrew/cask)/cmd/lib/generate-matrix.rb" ${{ github.event.inputs.skip_install && '--skip-install' }} ${{ github.event.inputs.new_cask && '--new' }} --casks="$INPUT_CASKS" elif [[ "${GITHUB_EVENT_NAME}" == "push" ]] then brew ruby -- "$(brew --repository homebrew/cask)/cmd/lib/generate-matrix.rb" --syntax-only @@ -97,18 +97,12 @@ jobs: persist-credentials: false - name: Clean up CI machine + if: runner.os == 'macOS' run: | if [ "${{ matrix.runner }}" == 'macos-12' ] && ! brew uninstall --cask julia && ! rm -r /Applications/Julia-*.app; then echo '::warning::Removing Julia is no longer necessary.' fi - if ! rm /usr/local/share/man/man1/al.1 || \ - ! sudo rm /etc/paths.d/mono-commands || \ - ! sudo rm -r /Library/Frameworks/Mono.framework || \ - ! sudo pkgutil --forget com.xamarin.mono-MDK.pkg; then - echo '::warning::Uninstalling Mono is no longer necessary.' - fi - if ! rm /usr/local/bin/dotnet; then echo "::warning::Removing \`dotnet\` symlink is no longer necessary." fi @@ -122,7 +116,16 @@ jobs: fi brew unlink python && brew link --overwrite python - if: runner.os == 'macOS' + + - name: Clean up Mono from CI machine + if: matrix.runner != 'macos-14' && matrix.arch != 'arm' + run: | + if ! rm /usr/local/share/man/man1/al.1 || \ + ! sudo rm /etc/paths.d/mono-commands || \ + ! sudo rm -r /Library/Frameworks/Mono.framework || \ + ! sudo pkgutil --forget com.xamarin.mono-MDK.pkg; then + echo '::warning::Uninstalling Mono is no longer necessary.' + fi - name: Cache Homebrew Gems id: cache