Fix static builds

tchoutri · Jul 4, 2024 · a0678ee · a0678ee
1 parent b14c6f1
commit a0678ee
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 72 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -63,6 +63,9 @@ jobs:
       - name: Install
         run: cabal install --project-file=cabal.release.project --installdir=distribution --install-method=copy
 
+      - name: File type
+        run: file distribution/confer
+
       - name: Package the confer-head executable
         run: |
           CONFER_EXEC=distribution/confer
@@ -78,68 +81,75 @@ jobs:
           name: confer-${{ runner.os }}-${{ env.ARCH }}
           path: ${{ env.CONFER_EXEC_TAR }}
 
-  # build-alpine:
-  #   name: Build statically linked using alpine
-  #   runs-on: ubuntu-latest
-  #   container: 'alpine:3.19'
-  #   needs: ['tests']
-  #   steps:
-  #     - name: Install extra dependencies
-  #       shell: sh
-  #       run: |
-  #         apk add bash curl sudo jq pkgconfig \
-  #         zlib-dev zlib-static binutils-gold curl \
-  #         gcc g++ gmp-dev libc-dev libffi-dev make \
-  #         musl-dev ncurses-dev perl tar xz git upx
-  #
-  #     - uses: actions/checkout@v4
-  #
-  #     - uses: haskell-actions/setup@v2
-  #       id: setup-haskell
-  #       with:
-  #         ghc-version: '9.8.2'
-  #         cabal-version: 'latest'
-  #
-  #     - name: Configure
-  #       run: | 
-  #         ARCHITECTURE=$(uname -m)
-  #         echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV
-  #         echo ${{ env.ARCH }}
-  #         cabal configure --enable-tests
-  #
-  #     - name: Freeze
-  #       run: cabal freeze --project-file=cabal.static.project
-  #
-  #     - uses: actions/cache@v4
-  #       with:
-  #         path: ${{ steps.setup-haskell.outputs.cabal-store }}
-  #         key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-${{ hashFiles('**/plan.json') }}
-  #         restore-keys: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-
-  #
-  #     - name: Build
-  #       run: cabal build --project-file=cabal.static.project
-  #
-  #     - name: Test
-  #       run: cabal test --project-file=cabal.static.project all
-  #
-  #     - name: Install
-  #       run: cabal install --project-file=cabal.static.project --installdir=distribution --install-method=copy
-  #
-  #     - name: Tar cabal head executable
-  #       run: |
-  #         CONFER_EXEC=distribution/confer
-  #         .github/workflows/process-binaries.sh
-  #         DIR=$(dirname $CONFER_EXEC)
-  #         FILE=$(basename $CONFER_EXEC)
-  #         CONFER_EXEC_TAR=confer-head-${{ runner.os }}-static-${{ env.ARCH }}.tar.gz
-  #         tar -czvf $CONFER_EXEC_TAR -C $DIR $FILE
-  #         echo CONFER_EXEC_TAR=$CONFER_EXEC_TAR >> $GITHUB_ENV
-  #
-  #     - name: Upload confer executable to workflow artifacts
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         name: confer-${{ runner.os }}-static-x86_64
-  #         path: ${{ env.CONFER_EXEC_TAR }}
+  build-alpine:
+    name: 9.8.2 on alpine-3.19
+    runs-on: ubuntu-latest
+    container: 'alpine:3.19'
+    needs: generate-matrix
+    steps:
+      - name: Install extra dependencies
+        shell: sh
+        run: | 
+            apk add bash binutils-gold curl \
+                curl file g++ gcc git gmp-dev \
+                jq libc-dev libffi-dev make \
+                musl-dev ncurses-dev perl pkgconfig \
+                sudo tar upx xz zlib-dev zlib-static
+
+      - uses: actions/checkout@v4
+
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: '9.8.2'
+          cabal-version: 'latest'
+
+      - name: Configure
+        run: | 
+          ARCHITECTURE=$(uname -m)
+          echo "ARCH=$ARCHITECTURE" >> $GITHUB_ENV
+          echo ${{ env.ARCH }}
+          cabal configure --enable-tests
+
+      - name: Freeze
+        run: cabal freeze --project-file=cabal.static.project
+
+      - uses: actions/cache@v4
+        with:
+          path: ${{ steps.setup-haskell.outputs.cabal-store }}
+          key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-${{ hashFiles('**/plan.json') }}
+          restore-keys: ${{ runner.os }}-${{ steps.setup.outputs.ghc-version }}-
+
+      - name: Build
+        run: cabal build --project-file=cabal.static.project
+
+      - name: Test
+        run: cabal test --project-file=cabal.static.project all
+
+      - name: Install
+        run: |
+          bin=$(cabal -v0 --project-file=cabal.static.project list-bin confer)
+          mkdir distribution
+          install ${bin} distribution/confer
+
+      - name: File type
+        run: file distribution/confer
+
+      - name: Tar cabal head executable
+        run: |
+          CONFER_EXEC=distribution/confer
+          .github/workflows/process-binaries.sh
+          DIR=$(dirname $CONFER_EXEC)
+          FILE=$(basename $CONFER_EXEC)
+          CONFER_EXEC_TAR=confer-head-${{ runner.os }}-static-${{ env.ARCH }}.tar.gz
+          tar -czvf $CONFER_EXEC_TAR -C $DIR $FILE
+          echo CONFER_EXEC_TAR=$CONFER_EXEC_TAR >> $GITHUB_ENV
+
+      - name: Upload confer executable to workflow artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: confer-${{ runner.os }}-static-x86_64
+          path: ${{ env.CONFER_EXEC_TAR }}
 
   prerelease-head:
     name: Create a GitHub prerelease with the binary artifacts
@@ -155,9 +165,9 @@ jobs:
     - uses: actions/download-artifact@v4
       with:
         name: confer-Linux-static-x86_64
-    # - uses: actions/download-artifact@v3
-    #   with:
-    #     name: confer-Linux-static-x86_64
+    - uses: actions/download-artifact@v3
+      with:
+        name: confer-Linux-static-x86_64
 
     - uses: actions/download-artifact@v4
       with:

diff --git a/.github/workflows/process-binaries.sh b/.github/workflows/process-binaries.sh
@@ -4,6 +4,7 @@ CONFER_PATH="distribution/confer"
 
 case "$(uname -s)" in
         Linux*) 
+          strip $CONFER_PATH
           upx -9 $CONFER_PATH
           ;;
         Darwin*)

diff --git a/cabal.static.project b/cabal.static.project
@@ -1,7 +1,4 @@
 import: ./cabal.release.project
 
 executable-static: true
-
-package confer
-  ghc-options: -static
-  ld-options: -static -pthread
+split-sections: True
diff --git a/src/Confer/CLI/Cmd/Deploy.hs b/src/Confer/CLI/Cmd/Deploy.hs
@@ -1,7 +1,7 @@
 module Confer.CLI.Cmd.Deploy (deploy) where
 
 import Control.Monad
-import Control.Placeholder
+
 import Data.Text.Display
 import Data.Text.IO qualified as Text
 import Data.Vector (Vector)

diff --git a/src/Confer/Config/ConfigFile.hs b/src/Confer/Config/ConfigFile.hs
@@ -5,7 +5,7 @@ module Confer.Config.ConfigFile
   ) where
 
 import Control.Monad (when)
-import Control.Placeholder
+
 import Data.Text qualified as Text
 import Data.Text.Display
 import Data.Text.IO qualified as Text

diff --git a/src/Confer/Config/Evaluator.hs b/src/Confer/Config/Evaluator.hs
@@ -4,7 +4,7 @@ module Confer.Config.Evaluator
   ) where
 
 import Control.Monad (void, when)
-import Control.Placeholder
+
 import Data.Maybe (isNothing)
 import Data.Text (Text)
 import Data.Text qualified as Text