Skip to content

Commit 7624adc

Browse files
committed
CI: Cleaner refactor for EXTRA_FLAGS
1 parent 52c2c0d commit 7624adc

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ jobs:
1313
os: [macos-13, macos-14, ubuntu-22.04, ubuntu-24.04]
1414
compiler: [ gfortran ]
1515
version: [ 12, 13, 14 ]
16-
extra_flags: [ '"-ffree-line-length-0"' ]
16+
extra_flags: [ -ffree-line-length-0 ]
1717
include:
1818
# https://hub.docker.com/r/phhargrove/llvm-flang/tags
1919
- os: ubuntu-24.04
2020
compiler: flang
2121
version: 20
22-
extra_flags: '"-g"'
22+
extra_flags: -g
2323
container: phhargrove/llvm-flang:20.1.0-1
2424
- os: ubuntu-24.04
2525
compiler: flang
2626
version: 19
27-
extra_flags: '[ "-g", "-mmlir", "-allow-assumed-rank" ]'
27+
extra_flags: -g -mmlir -allow-assumed-rank
2828
container: phhargrove/llvm-flang:19.1.1-1
2929
# - os: ubuntu-24.04
3030
# compiler: flang
@@ -44,7 +44,7 @@ jobs:
4444
env:
4545
GCC_VERSION: ${{ matrix.version }}
4646
FC: ${{ matrix.compiler }}
47-
EXTRA_FLAGS: ${{ join(fromJSON(matrix.extra_flags), ' --flag ') }}
47+
FPM_FLAGS: --profile release --verbose
4848

4949
steps:
5050
- name: Checkout code
@@ -93,21 +93,19 @@ jobs:
9393
fpm --version
9494
9595
- name: Build and Test (Assertions OFF)
96-
env:
97-
FPM_FLAGS: --profile release --flag ${{ env.EXTRA_FLAGS }}
9896
run: |
9997
set -x
100-
fpm test --verbose ${FPM_FLAGS}
101-
fpm run --verbose --example false-assertion ${FPM_FLAGS}
102-
fpm run --verbose --example invoke-via-macro ${FPM_FLAGS}
98+
fpm test ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}"
99+
fpm run --example false-assertion ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}"
100+
fpm run --example invoke-via-macro ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}"
103101
104102
- name: Build and Test (Assertions ON)
105-
env:
106-
FPM_FLAGS: --profile release --flag ${{ env.EXTRA_FLAGS }} --flag -DASSERTIONS
103+
env:
104+
FPM_FLAGS: ${{ env.FPM_FLAGS }} --flag -DASSERTIONS
107105
run: |
108106
set -x
109-
fpm test --verbose ${FPM_FLAGS}
110-
( set +e ; fpm run --verbose --example false-assertion ${FPM_FLAGS} ; test $? = 1 )
111-
( set +e ; fpm run --verbose --example invoke-via-macro ${FPM_FLAGS} ; test $? = 1 )
107+
fpm test ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}"
108+
( set +e ; fpm run --example false-assertion ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = 1 )
109+
( set +e ; fpm run --example invoke-via-macro ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = 1 )
112110
113111

0 commit comments

Comments
 (0)