Skip to content

Commit 34378d7

Browse files
authored
Do not create gfortran symlink on macOS (#23)
The original CI workflow assumed that an executable `gfortran-14` was available on macOS, but not a `gfortran`. Therefore a symlink named `gfortran` was created without even checking if this was really necessary. Recent CI failures showed instead that a binary file named `gfortran` already existed. Therefore, we now use the available command `gfortran` on macOS as well as Ubuntu, with no distinction. Fixes #22.
1 parent 148975c commit 34378d7

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.github/workflows/build-deploy-book.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
- os: macos-15
1919
python-version: '3.12'
2020
name: build / ${{ matrix.os }} / python${{ matrix.python-version }}
21-
env:
22-
FC: gfortran-14
2321

2422
steps:
2523
- uses: actions/checkout@v4
@@ -54,17 +52,10 @@ jobs:
5452
run: |
5553
brew install open-mpi hdf5-mpi libomp
5654
57-
- name: Check gfortran version
55+
- name: Check gfortran version, and location of executable
5856
run: |
59-
if [[ "${{ matrix.os }}" == *"macos"* ]]; then
60-
# pyccel searches for a Fortran compiler exactly named 'gfortran'
61-
# which the macos runner doesn't have. A simple workaround is to
62-
# create a symlink named 'gfortran'.
63-
FC_path=$(which $FC)
64-
FC_dir=$(dirname ${FC_path})
65-
ln -sv ${FC_path} ${FC_dir}/gfortran
66-
fi
6757
gfortran --version
58+
which gfortran
6859
6960
- name: Install Jupyter Book and Psydac
7061
run: |
@@ -121,7 +112,7 @@ jobs:
121112
name: github-pages
122113
url: ${{ steps.deployment.outputs.page_url }}
123114

124-
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
115+
# Grant GITHUB_TOKEN the permissions required to make a Pages deployment
125116
permissions:
126117
pages: write # to deploy to Pages
127118
id-token: write # to verify the deployment originates from an appropriate source

0 commit comments

Comments
 (0)