From c5d4a3393fc7e75ea572068df4a608d95e21f61e Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Fri, 8 Mar 2024 10:25:27 -0500 Subject: [PATCH 1/2] fix(mac/gcc): brew doesn't create unversioned gcc symlink --- setup-fortran.sh | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 04c41ee..05e4c5e 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -46,18 +46,15 @@ install_gcc_brew() brew link gcc@${version} os_ver=$(sw_vers -productVersion | cut -d'.' -f1) - # brew link doesn't create aliases without version numbers before gcc 13 - if (( "$version" < 13 )); then - # default homebrew bin dir changed with macos 14 - if (( "$os_ver" > 13 )); then - ln -fs /opt/homebrew/bin/gfortran-${version} /usr/local/bin/gfortran - ln -fs /opt/homebrew/bin/gcc-${version} /usr/local/bin/gcc - ln -fs /opt/homebrew/bin/g++-${version} /usr/local/bin/g++ - else - ln -fs /usr/local/bin/gfortran-${version} /usr/local/bin/gfortran - ln -fs /usr/local/bin/gcc-${version} /usr/local/bin/gcc - ln -fs /usr/local/bin/g++-${version} /usr/local/bin/g++ - fi + # default homebrew bin dir changed with macos 14 + if (( "$os_ver" > 13 )); then + ln -fs /opt/homebrew/bin/gfortran-${version} /usr/local/bin/gfortran + ln -fs /opt/homebrew/bin/gcc-${version} /usr/local/bin/gcc + ln -fs /opt/homebrew/bin/g++-${version} /usr/local/bin/g++ + else + ln -fs /usr/local/bin/gfortran-${version} /usr/local/bin/gfortran + ln -fs /usr/local/bin/gcc-${version} /usr/local/bin/gcc + ln -fs /usr/local/bin/g++-${version} /usr/local/bin/g++ fi } From d5a47ccbd93f2c8184c0b1e125e7f9c6b94da98c Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Fri, 8 Mar 2024 10:34:14 -0500 Subject: [PATCH 2/2] test workflow should create a PR updating README on any trigger as long as it's running in report mode --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c9a60c6..df42e70 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -186,15 +186,15 @@ jobs: fi - name: Update README - if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }} + if: ${{ steps.diff.outputs.diff == 'true' }} run: python .github/compat/update_compat_table.py ".github/compat/compat.md" "README.md" - name: Print README diff - if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }} + if: ${{ steps.diff.outputs.diff == 'true' }} run: git diff README.md - name: Create pull request - if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }} + if: ${{ steps.diff.outputs.diff == 'true' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: |