From 302d54a4f7ecdd2d2c9e0f1cb445efca7424bc22 Mon Sep 17 00:00:00 2001
From: LKedward <laurence.kedward@bristol.ac.uk>
Date: Thu, 19 Nov 2020 10:13:13 +0000
Subject: Fix compile flags for release binaries

---
 .github/workflows/CI.yml | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 0191b37..eb0e9db 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -25,7 +25,7 @@ jobs:
           STACK_CACHE_VERSION: ""
           BOOTSTRAP_FILE: "/home/runner/.local/bin/fpm"
           XSUFFIX: ""
-          RELEASE_CMD: "fpm run --flag --static --runner cp"
+          RELEASE_CMD: "fpm run --flag --static --flag -g --flag -fbacktrace --flag -O3 --runner cp"
         - os: macos-latest
           STACK_CACHE: |
            /Users/runner/.stack/snapshots
@@ -33,7 +33,7 @@ jobs:
           STACK_CACHE_VERSION: "v2"
           BOOTSTRAP_FILE: "/Users/runner/.local/bin/fpm"
           XSUFFIX: ""
-          RELEASE_CMD: "fpm run --runner cp"
+          RELEASE_CMD: "fpm run --flag -g --flag -fbacktrace --flag -O3 --runner cp"
         - os: windows-latest
           STACK_CACHE: |
            C:\Users\runneradmin\AppData\Roaming\stack
@@ -41,7 +41,7 @@ jobs:
           STACK_CACHE_VERSION: "v2"
           BOOTSTRAP_FILE: C:\Users\runneradmin\AppData\Roaming\local\bin\fpm.exe
           XSUFFIX: ".exe"
-          RELEASE_CMD: "fpm run --flag --static --runner copy"
+          RELEASE_CMD: "fpm run --flag --static --flag -g --flag -fbacktrace --flag -O3 --runner copy"
 
     env:
       FC: gfortran
@@ -122,30 +122,18 @@ jobs:
         fpm run -- "--version" | grep $(echo ${{ github.ref }} | cut -d/ -f3)
 
     - name: Stage release files for upload
-      if: github.event_name == 'release' && (contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos'))
+      if: github.event_name == 'release'
       run: |
         cd fpm
-        ${{ matrix.RELEASE_CMD }} -- fpm-${{ matrix.os }}-x86_64-debug
-        ${{ matrix.RELEASE_CMD }} --release -- fpm-${{ matrix.os }}-x86_64-release
+        ${{ matrix.RELEASE_CMD }} -- fpm-${{ matrix.os }}-x86_64
          
     - name: Upload debug binary
       if: github.event_name == 'release'
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: fpm/fpm-${{ matrix.os }}-x86_64-debug
-        asset_name: fpm-${{ matrix.os }}-x86_64-debug${{ matrix.XSUFFIX }}
-        tag: ${{ github.ref }}
-        overwrite: true
-        prerelease: true
-
-    - name: Upload release binary
-      if: github.event_name == 'release'
-      uses: svenstaro/upload-release-action@v2
-      with:
-        repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: fpm/fpm-${{ matrix.os }}-x86_64-release
-        asset_name: fpm-${{ matrix.os }}-x86_64-release${{ matrix.XSUFFIX }}
+        file: fpm/fpm-${{ matrix.os }}-x86_64
+        asset_name: fpm-${{ matrix.os }}-x86_64${{ matrix.XSUFFIX }}
         tag: ${{ github.ref }}
         overwrite: true
         prerelease: true
@@ -156,7 +144,7 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         file: ${{ matrix.BOOTSTRAP_FILE }}
-        asset_name: fpm-bootstrap-${{ matrix.os }}-x86_64-debug${{ matrix.XSUFFIX }}
+        asset_name: fpm-bootstrap-${{ matrix.os }}-x86_64${{ matrix.XSUFFIX }}
         tag: ${{ github.ref }}
         overwrite: true
         prerelease: true
\ No newline at end of file
-- 
cgit v1.2.3