Skip to content

Commit 00443e0

Browse files
committed
Add --static flag back to binary releases
1 parent 0cffb8a commit 00443e0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.github/workflows/CI.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ jobs:
2929
STACK_CACHE_VERSION: ""
3030
GET_VERSION_CMD: echo ${{ github.ref }} | cut -dv -f2
3131
CHECK_VERSION_CMD: grep $(cat fpm_version)
32-
RELEASE_CMD: "fpm run $RELEASE_FLAGS --runner cp -- fpm-v$(cat fpm_version)-linux-x86_64"
32+
RELEASE_CMD: "cp -- fpm-v$(cat fpm_version)-linux-x86_64"
3333
BOOTSTRAP_RELEASE_CMD: cp /home/runner/.local/bin/fpm fpm-bootstrap-v$(cat fpm_version)-linux-x86_64
3434
HASH_CMD: ls fpm-*|xargs -i{} sh -c 'sha256sum $1 > $1.sha256' -- {}
35+
RELEASE_FLAGS: --flag --static --flag -g --flag -fbacktrace --flag -O3
3536

3637
- os: macos-latest
3738
STACK_CACHE: |
@@ -40,9 +41,10 @@ jobs:
4041
STACK_CACHE_VERSION: "v2"
4142
GET_VERSION_CMD: echo ${{ github.ref }} | cut -dv -f2
4243
CHECK_VERSION_CMD: grep $(cat fpm_version)
43-
RELEASE_CMD: "fpm run $RELEASE_FLAGS --runner cp -- fpm-v$(cat fpm_version)-macos-x86_64"
44+
RELEASE_CMD: "cp -- fpm-v$(cat fpm_version)-macos-x86_64"
4445
BOOTSTRAP_RELEASE_CMD: cp /Users/runner/.local/bin/fpm fpm-bootstrap-v$(cat fpm_version)-macos-x86_64
4546
HASH_CMD: ls fpm-*|xargs -I{} sh -c 'shasum -a 256 $1 > $1.sha256' -- {}
47+
RELEASE_FLAGS: --flag -g --flag -fbacktrace --flag -O3
4648

4749
- os: windows-latest
4850
STACK_CACHE: |
@@ -51,14 +53,14 @@ jobs:
5153
STACK_CACHE_VERSION: "v2"
5254
GET_VERSION_CMD: ("${{ github.ref }}" -Split "v")[1]
5355
CHECK_VERSION_CMD: Select-String -Pattern Version | Where-Object { if ($_ -like -join("*",(Get-Content fpm_version),"*")) {echo $_} else {Throw} }
54-
RELEASE_CMD: fpm run $RELEASE_FLAGS --runner copy -- (-join("fpm-v",(Get-Content fpm_version),"-windows-x86_64.exe"))
56+
RELEASE_CMD: copy -- (-join("fpm-v",(Get-Content fpm_version),"-windows-x86_64.exe"))
5557
BOOTSTRAP_RELEASE_CMD: copy C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe (-join("fpm-bootstrap-v",(Get-Content fpm_version),"-windows-x86_64.exe"))
5658
HASH_CMD: Get-ChildItem -File -Filter "fpm-*" | Foreach-Object {echo (Get-FileHash -Algorithm SHA256 $PSItem | Select-Object hash | Format-Table -HideTableHeaders | Out-String) > (-join($PSItem,".sha256"))}
59+
RELEASE_FLAGS: --flag --static --flag -g --flag -fbacktrace --flag -O3
5760

5861
env:
5962
FC: gfortran
6063
GCC_V: ${{ matrix.gcc_v }}
61-
RELEASE_FLAGS: --flag -g --flag -fbacktrace --flag -O3
6264

6365
steps:
6466
- name: Checkout code
@@ -121,13 +123,13 @@ jobs:
121123
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
122124
run: |
123125
ci/run_tests.sh
124-
ci/run_tests.sh ${{ env.RELEASE_FLAGS }}
126+
ci/run_tests.sh ${{ matrix.RELEASE_FLAGS }}
125127
126128
- name: Build and run Fortran fpm (Windows)
127129
if: contains(matrix.os, 'windows')
128130
run: |
129131
ci\run_tests.bat
130-
ci\run_tests.bat ${{ env.RELEASE_FLAGS }}
132+
ci\run_tests.bat ${{ matrix.RELEASE_FLAGS }}
131133
132134
# ----- Upload binaries if creating a release -----
133135
- name: Check that fpm --version matches release tag
@@ -141,7 +143,7 @@ jobs:
141143
if: github.event_name == 'release'
142144
run: |
143145
cd fpm
144-
${{ matrix.RELEASE_CMD }}
146+
fpm run ${{ matrix.RELEASE_FLAGS }} --runner ${{ matrix.RELEASE_CMD }}
145147
${{ matrix.BOOTSTRAP_RELEASE_CMD }}
146148
${{ matrix.HASH_CMD }}
147149

0 commit comments

Comments
 (0)