Skip to content

Commit 36da76d

Browse files
authored
Merge pull request #264 from bonachea/fpm-simplify
[NO REVIEW]: CI tweaks for fpm-setup
2 parents 3a8f90c + 54f2dca commit 36da76d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,14 +180,12 @@ jobs:
180180
181181
- name: Setup FPM
182182
uses: fortran-lang/setup-fpm@main
183-
if: ${{ !contains(matrix.os, 'macos') || matrix.os == 'macos-13' || matrix.os == 'macos-15-intel'}}
184183
with:
185184
github-token: ${{ secrets.GITHUB_TOKEN }}
186185
fpm-version: latest
187186

188187
- name: Build FPM
189-
# no macos-arm64 fpm distro, build from source
190-
if: ${{ contains(matrix.os, 'macos') && matrix.os != 'macos-13' && matrix.os != 'macos-15-intel' }}
188+
if: false
191189
run: |
192190
set -x
193191
export FPM_VERSION=0.12.0
@@ -199,10 +197,14 @@ jobs:
199197
- name: Version info
200198
run: |
201199
echo == TOOL VERSIONS ==
202-
(set -x ; uname -a )
203-
if test -r /etc/os-release ; then (set -x ; cat /etc/os-release ) ; fi
200+
echo Platform version info:
201+
uname -a
202+
if test -r /etc/os-release ; then grep -e NAME -e VERSION /etc/os-release ; fi
203+
if test -x /usr/bin/sw_vers ; then /usr/bin/sw_vers ; fi
204+
echo
205+
echo PATH="$PATH"
204206
for tool in ${FC} ${CC} ${CXX} fpm ; do
205-
( set -x ; w=$(which $tool) ; ls -al $w ; ls -alhL $w ; $tool --version )
207+
( echo ; set -x ; w=$(which $tool) ; ls -al $w ; ls -alhL $w ; $tool --version )
206208
done
207209
208210
- name: Build Caffeine (install.sh)

0 commit comments

Comments
 (0)