From ec4a657b42bfddb7377a6f44c5ac10b7779e6d9f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:40:09 +0800 Subject: [PATCH 01/11] Update tools in CI --- .github/workflows/release.yaml | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d73fbf1..0b20334 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,8 +21,8 @@ jobs: name: Build linux binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 - JSON_VERSION: "0.0.7" + CABAL_VER: 3.10.2.0 + JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} S3_HOST: ${{ secrets.S3_HOST }} @@ -32,11 +32,11 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 32 - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 64 steps: - name: Checkout code @@ -85,8 +85,8 @@ jobs: name: Build ARM binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 - JSON_VERSION: "0.0.7" + CABAL_VER: 3.10.2.0 + JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} S3_HOST: ${{ secrets.S3_HOST }} @@ -96,11 +96,11 @@ jobs: include: - os: [self-hosted, Linux, ARM64] ARTIFACT: "armv7-linux-ghcup" - GHC_VER: 9.2.2 + GHC_VER: 9.2.8 ARCH: ARM - os: [self-hosted, Linux, ARM64] ARTIFACT: "aarch64-linux-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: ARM64 steps: - uses: docker://arm64v8/debian:10 @@ -158,9 +158,9 @@ jobs: name: Build binary (Mac/Win) runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 + CABAL_VER: 3.10.2.0 MACOSX_DEPLOYMENT_TARGET: 10.13 - JSON_VERSION: "0.0.7" + JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} S3_HOST: ${{ secrets.S3_HOST }} @@ -170,15 +170,15 @@ jobs: include: - os: [self-hosted, macOS, ARM64] ARTIFACT: "aarch64-apple-darwin-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: ARM64 - os: macOS-11 ARTIFACT: "x86_64-apple-darwin-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: 64 - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.2.8 ARCH: 64 steps: - name: Checkout code @@ -251,24 +251,24 @@ jobs: needs: "build-linux" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 - JSON_VERSION: "0.0.7" + CABAL_VER: 3.10.2.0 + JSON_VERSION: "0.0.8" strategy: matrix: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 32 DISTRO: Alpine - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 64 DISTRO: Alpine - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.4.8 ARCH: 64 DISTRO: Ubuntu @@ -329,19 +329,19 @@ jobs: needs: "build-arm" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 - JSON_VERSION: "0.0.7" + CABAL_VER: 3.10.2.0 + JSON_VERSION: "0.0.8" strategy: matrix: include: - os: [self-hosted, Linux, ARM64] ARTIFACT: "armv7-linux-ghcup" - GHC_VER: 9.2.2 + GHC_VER: 9.2.8 ARCH: ARM DISTRO: Ubuntu - os: [self-hosted, Linux, ARM64] ARTIFACT: "aarch64-linux-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: ARM64 DISTRO: Ubuntu @@ -396,25 +396,25 @@ jobs: needs: "build-macwin" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.1.0 + CABAL_VER: 3.10.2.0 MACOSX_DEPLOYMENT_TARGET: 10.13 - JSON_VERSION: "0.0.7" + JSON_VERSION: "0.0.8" strategy: matrix: include: - os: [self-hosted, macOS, ARM64] ARTIFACT: "aarch64-apple-darwin-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: ARM64 DISTRO: na - os: macOS-11 ARTIFACT: "x86_64-apple-darwin-ghcup" - GHC_VER: 9.2.6 + GHC_VER: 9.4.8 ARCH: 64 DISTRO: na - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.2.8 ARCH: 64 DISTRO: na @@ -475,7 +475,7 @@ jobs: GHC_VERSION: "8.10.7" HLS_TARGET_VERSION: "1.8.0.0" CABAL_VERSION: "3.8.1.0" - JSON_VERSION: "0.0.7" + JSON_VERSION: "0.0.8" ARTIFACT: "x86_64-linux-ghcup" DISTRO: Ubuntu ARCH: 64 From e969489ca2ab25dd686d1756cfcd27a47f91f277 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:51:45 +0800 Subject: [PATCH 02/11] Fix build on windows --- ghcup.cabal | 2 -- 1 file changed, 2 deletions(-) diff --git a/ghcup.cabal b/ghcup.cabal index 476eb8e..0d29ec0 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -327,12 +327,10 @@ executable ghcup , brick ^>=2.1 , transformers ^>=0.5 , vty ^>=6.0 - , unix ^>=2.7 , optics ^>=0.4 if os(windows) cpp-options: -DIS_WINDOWS - else build-depends: unix ^>=2.7 From 4eec582f1b07221a428290db4450361af1220f9c Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:53:25 +0800 Subject: [PATCH 03/11] Update alpine docker containers --- .github/workflows/release.yaml | 8 ++++---- docker/alpine32/Dockerfile | 12 ++++++------ docker/alpine64/Dockerfile | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0b20334..8678203 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.16 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.16 with: args: sh .github/scripts/build.sh env: @@ -285,7 +285,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.16 with: args: sh .github/scripts/test.sh env: @@ -296,7 +296,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.16 with: args: sh .github/scripts/test.sh env: diff --git a/docker/alpine32/Dockerfile b/docker/alpine32/Dockerfile index 74d25a2..fd6c9aa 100644 --- a/docker/alpine32/Dockerfile +++ b/docker/alpine32/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/i386 i386/alpine:3.12 +FROM --platform=linux/i386 i386/alpine:3.16 ENV LANG C.UTF-8 @@ -37,8 +37,8 @@ RUN apk add --no-cache \ xz-dev \ ncurses-static -ARG GHCUP_VERSION=0.1.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ @@ -51,9 +51,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 -ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG GHC=9.4.8 +ARG CABAL_INSTALL=3.10.2.0 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1 diff --git a/docker/alpine64/Dockerfile b/docker/alpine64/Dockerfile index aecdbc5..fe40833 100644 --- a/docker/alpine64/Dockerfile +++ b/docker/alpine64/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.16 ENV LANG C.UTF-8 @@ -37,8 +37,8 @@ RUN apk add --no-cache \ xz-dev \ ncurses-static -ARG GHCUP_VERSION=0.1.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup @@ -52,9 +52,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 -ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG GHC=9.4.8 +ARG CABAL_INSTALL=3.10.2.0 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1 From 125125b9dba6225d22224151a8cb89de8779793f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:55:26 +0800 Subject: [PATCH 04/11] Downgrade cabal on armv7 --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8678203..eda6d3d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -85,7 +85,7 @@ jobs: name: Build ARM binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.6.2.0 JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -329,7 +329,7 @@ jobs: needs: "build-arm" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.6.2.0 JSON_VERSION: "0.0.8" strategy: matrix: From a1103c05a5c3ac9a998d6a0634ab134b553aa669 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 3 Dec 2023 23:55:49 +0800 Subject: [PATCH 05/11] Update ARM docker images --- docker/arm32v7/buster/Dockerfile | 8 ++++---- docker/arm64v8/buster/Dockerfile | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/arm32v7/buster/Dockerfile b/docker/arm32v7/buster/Dockerfile index 5f2e301..0af6803 100644 --- a/docker/arm32v7/buster/Dockerfile +++ b/docker/arm32v7/buster/Dockerfile @@ -29,8 +29,8 @@ RUN apt-get update && \ RUN update_opt.sh 11 1 -ARG GHCUP_VERSION=0.1.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ @@ -43,9 +43,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 +ARG GHC=9.2.8 ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1 diff --git a/docker/arm64v8/buster/Dockerfile b/docker/arm64v8/buster/Dockerfile index f9bd0f2..32440b7 100644 --- a/docker/arm64v8/buster/Dockerfile +++ b/docker/arm64v8/buster/Dockerfile @@ -29,8 +29,8 @@ RUN apt-get update && \ RUN update_opt.sh 11 1 -ARG GHCUP_VERSION=0.1.19.4 -ARG GPG_KEY=7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C +ARG GHCUP_VERSION=0.1.20.0 +ARG GPG_KEY="7D1E8AFD1D4A16D71FADA2F2CCC85C0E40C06A8C FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD 88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4 EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF" # install ghcup RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ @@ -43,9 +43,9 @@ RUN gpg --batch --keyserver keys.openpgp.org --recv-keys $GPG_KEY && \ chmod +x /usr/bin/ghcup && \ rm -rf SHA256SUMS SHA256SUMS.sig -ARG GHC=8.10.7 -ARG CABAL_INSTALL=3.6.2.0 -ARG STACK=2.9.1 +ARG GHC=9.4.8 +ARG CABAL_INSTALL=3.10.2.0 +ARG STACK=2.13.1 ENV GHCUP_CURL_OPTS="--silent" ENV NO_COLOR=1 From bfe56aed1f7152307cd6e09e7ac298ce38b15f11 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 4 Dec 2023 00:02:25 +0800 Subject: [PATCH 06/11] Fix Dockerfile --- docker/alpine32/Dockerfile | 2 +- docker/alpine64/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/alpine32/Dockerfile b/docker/alpine32/Dockerfile index fd6c9aa..6c2a412 100644 --- a/docker/alpine32/Dockerfile +++ b/docker/alpine32/Dockerfile @@ -63,7 +63,7 @@ RUN ghcup config set gpg-setting GPGStrict && \ ghcup --verbose install ghc --isolate=/usr --force ${GHC} && \ ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \ find "/usr/lib/ghc-${GHC}/" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete && \ - rm -r "/usr/share/doc/ghc-${GHC}" && \ + rm -rf "/usr/share/doc/ghc-${GHC}" && \ rm -rf /tmp/ghcup* && \ ghcup gc -p -s -c -t diff --git a/docker/alpine64/Dockerfile b/docker/alpine64/Dockerfile index fe40833..c4152ba 100644 --- a/docker/alpine64/Dockerfile +++ b/docker/alpine64/Dockerfile @@ -64,7 +64,7 @@ RUN ghcup config set gpg-setting GPGStrict && \ ghcup --verbose install ghc --isolate=/usr --force ${GHC} && \ ghcup --verbose install cabal --isolate=/usr/bin --force ${CABAL_INSTALL} && \ find "/usr/lib/ghc-${GHC}/" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete && \ - rm -r "/usr/share/doc/ghc-${GHC}" && \ + rm -rf "/usr/share/doc/ghc-${GHC}" && \ rm -rf /tmp/ghcup* && \ ghcup gc -p -s -c -t From 7d0ba7fc62068540be38729df5bb05499666a4af Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 4 Dec 2023 21:39:43 +0800 Subject: [PATCH 07/11] Bump llvm to 13 --- .github/workflows/release.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eda6d3d..097c024 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -189,13 +189,13 @@ jobs: - if: matrix.ARCH == 'ARM64' && runner.os == 'macOS' name: Run build run: | - bash .github/scripts/brew.sh git coreutils llvm@11 autoconf automake - export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@11/bin:$PATH" - export CC="$HOME/.brew/opt/llvm@11/bin/clang" - export CXX="$HOME/.brew/opt/llvm@11/bin/clang++" + bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake + export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@13/bin:$PATH" + export CC="$HOME/.brew/opt/llvm@13/bin/clang" + export CXX="$HOME/.brew/opt/llvm@13/bin/clang++" export LD=ld - export AR="$HOME/.brew/opt/llvm@11/bin/llvm-ar" - export RANLIB="$HOME/.brew/opt/llvm@11/bin/llvm-ranlib" + export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar" + export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib" bash .github/scripts/build.sh env: ARTIFACT: ${{ matrix.ARTIFACT }} From 5ff61cdf863272ab51fabd8012ead0cb6b7fad94 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 4 Dec 2023 21:43:53 +0800 Subject: [PATCH 08/11] Bump toolchain in cirrus CI --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 993da12..d3014ad 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -4,8 +4,8 @@ freebsd_instance: build_task: name: build env: - GHC_VER: 9.2.4 - CABAL_VER: 3.8.1.0 + GHC_VER: 9.4.8 + CABAL_VER: 3.10.2.0 ARTIFACT: "x86_64-portbld-freebsd-ghcup" ARCH: 64 RUNNER_OS: FreeBSD From 71b7c96ddd161486a204cb93f4940693c5ef7300 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 4 Dec 2023 23:14:52 +0800 Subject: [PATCH 09/11] Use alpine:3.12 It appears tat at least alpine:3.16 is broken and produces linking errors. --- .github/workflows/release.yaml | 8 ++++---- docker/alpine32/Dockerfile | 2 +- docker/alpine64/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 097c024..eb83ab9 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.16 + uses: docker://hasufell/i386-alpine-haskell:3.12 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.16 + uses: docker://hasufell/alpine-haskell:3.12 with: args: sh .github/scripts/build.sh env: @@ -285,7 +285,7 @@ jobs: - if: matrix.ARCH == '32' && matrix.DISTRO == 'Alpine' name: Run test (32 bit linux Alpine) - uses: docker://hasufell/i386-alpine-haskell:3.16 + uses: docker://hasufell/i386-alpine-haskell:3.12 with: args: sh .github/scripts/test.sh env: @@ -296,7 +296,7 @@ jobs: - if: matrix.ARCH == '64' && matrix.DISTRO == 'Alpine' name: Run test (64 bit linux Alpine) - uses: docker://hasufell/alpine-haskell:3.16 + uses: docker://hasufell/alpine-haskell:3.12 with: args: sh .github/scripts/test.sh env: diff --git a/docker/alpine32/Dockerfile b/docker/alpine32/Dockerfile index 6c2a412..993af5e 100644 --- a/docker/alpine32/Dockerfile +++ b/docker/alpine32/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/i386 i386/alpine:3.16 +FROM --platform=linux/i386 i386/alpine:3.12 ENV LANG C.UTF-8 diff --git a/docker/alpine64/Dockerfile b/docker/alpine64/Dockerfile index c4152ba..fd55f50 100644 --- a/docker/alpine64/Dockerfile +++ b/docker/alpine64/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.12 ENV LANG C.UTF-8 From 4e0efff4c4162a14df296985934546edb931a158 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 2 Jan 2024 19:08:06 +0800 Subject: [PATCH 10/11] Fix tests --- .github/scripts/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh index 4449900..331c1c3 100644 --- a/.github/scripts/test.sh +++ b/.github/scripts/test.sh @@ -193,7 +193,7 @@ sha=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml") # invalidate access time timer, which is 5minutes, so we re-download touch -a -m -t '199901010101' "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml" # redownload same file with some newlines added -raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-0.0.7.yaml list +raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-${JSON_VERSION}.yaml list # snapshot new yaml and etags file etag2=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags") sha2=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml") @@ -203,7 +203,7 @@ sha2=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml") # invalidate access time timer, which is 5minutes, but don't expect a re-download touch -a -m -t '199901010101' "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml" # this time, we expect the same hash and etag -raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-0.0.7.yaml list +raw_eghcup -s https://raw.githubusercontent.com/haskell/ghcup-metadata/exp/ghcup-${JSON_VERSION}.yaml list etag3=$(cat "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml.etags") sha3=$(sha_sum "${GHCUP_DIR}/cache/ghcup-${JSON_VERSION}.yaml") [ "${etag2}" = "${etag3}" ] From cac3cec135799b0b7d40f84e4a8227c533398e86 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 2 Jan 2024 19:08:32 +0800 Subject: [PATCH 11/11] Use i386/alpine:3.16 --- .github/workflows/release.yaml | 4 ++-- docker/alpine32/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eb83ab9..32a0fb1 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.16 with: args: sh .github/scripts/build.sh env: @@ -285,7 +285,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.16 with: args: sh .github/scripts/test.sh env: diff --git a/docker/alpine32/Dockerfile b/docker/alpine32/Dockerfile index 993af5e..6c2a412 100644 --- a/docker/alpine32/Dockerfile +++ b/docker/alpine32/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/i386 i386/alpine:3.12 +FROM --platform=linux/i386 i386/alpine:3.16 ENV LANG C.UTF-8