From a0a51827369e1f862a96f37fdf00c7d53df60221 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 28 Jan 2025 15:53:53 +0800 Subject: [PATCH] Update alpine images --- .github/workflows/release.yaml | 12 ++++++------ cabal.project.release | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 34e01385..f01a0c6a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -46,7 +46,7 @@ jobs: - if: matrix.ARCH == '32' name: Run build (32 bit linux) - uses: docker://hasufell/i386-alpine-haskell:3.12 + uses: docker://hasufell/i386-alpine-haskell:3.21 with: args: sh .github/scripts/build.sh env: @@ -60,7 +60,7 @@ jobs: - if: matrix.ARCH == '64' name: Run build (64 bit linux) - uses: docker://hasufell/alpine-haskell:3.12 + uses: docker://hasufell/alpine-haskell:3.21 with: args: sh .github/scripts/build.sh env: @@ -109,7 +109,7 @@ jobs: submodules: 'true' - if: matrix.ARCH == 'ARM64' - uses: docker://hasufell/arm64v8-alpine-haskell:3.20 + uses: docker://hasufell/arm64v8-alpine-haskell:3.21 name: Run build (aarch64 linux) with: args: sh -c ".github/scripts/build.sh '--ghc-options=-split-sections' '--enable-executable-static'" @@ -299,7 +299,7 @@ jobs: - if: matrix.ARCH == '32' && matrix.DISTRO == 'Alpine' name: Run test (32 bit linux Alpine) - uses: docker://hasufell/i386-alpine-haskell:3.12 + uses: docker://hasufell/i386-alpine-haskell:3.21 with: args: sh .github/scripts/test.sh env: @@ -310,7 +310,7 @@ jobs: - if: matrix.ARCH == '64' && matrix.DISTRO == 'Alpine' name: Run test (64 bit linux Alpine) - uses: docker://hasufell/alpine-haskell:3.12 + uses: docker://hasufell/alpine-haskell:3.21 with: args: sh .github/scripts/test.sh env: @@ -365,7 +365,7 @@ jobs: path: ./out - if: matrix.ARCH == 'ARM64' - uses: docker://hasufell/arm64v8-alpine-haskell:3.20 + uses: docker://hasufell/arm64v8-alpine-haskell:3.21 name: Run test (aarch64 alpine) with: args: sh .github/scripts/test.sh diff --git a/cabal.project.release b/cabal.project.release index 62158e8a..23039071 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -15,8 +15,8 @@ if os(linux) constraints: xz -system-xz if arch(x86_64) || arch(i386) flags: -tar - package * - ghc-options: -split-sections -optl-static + executable-static: True + split-sections: True elif arch(arm) flags: +tar else @@ -37,8 +37,7 @@ elif os(freebsd) constraints: zlib +bundled-c-zlib, zip +disable-zstd, xz -system-xz - package * - ghc-options: -split-sections + split-sections: True else package ghcup flags: +tar