From 5e9b5cde44ea18bdc0426cdb83dd66dcb79cfdc8 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Tue, 8 Apr 2025 15:46:36 +0800 Subject: [PATCH 1/3] Use GHC 9.6.7 for compiling ghcup on i386 Fixes #1107 --- .github/workflows/release.yaml | 4 ++-- cabal.project.release | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 58820269..23b65576 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.6.7 ARCH: 32 - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" @@ -272,7 +272,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 8.10.7 + GHC_VER: 9.6.7 ARCH: 32 DISTRO: Alpine - os: ubuntu-latest diff --git a/cabal.project.release b/cabal.project.release index 950d6300..297e6b3d 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -18,12 +18,20 @@ package libyaml if os(linux) package ghcup flags: +yaml-streamly - constraints: xz -system-xz - if arch(x86_64) || arch(i386) + if arch(x86_64) + constraints: xz -system-xz + flags: -tar + executable-static: True + package * + ghc-options: -split-sections + elif arch(i386) + constraints: xz +system-xz flags: -tar executable-static: True package * ghc-options: -split-sections + elif arch(aarch64) + constraints: xz -system-xz elif arch(arm) flags: +tar else From 20f5a04e38e73fe77e6e1a850fe73ed65a5aa912 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 9 Apr 2025 14:57:32 +0800 Subject: [PATCH 2/3] Fix apt fetching failures --- .github/workflows/bootstrap.yaml | 1 + .github/workflows/cabal.project.yaml | 2 +- .github/workflows/release.yaml | 2 ++ .github/workflows/stack.yaml | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml index 49b9a8b5..975b9e34 100644 --- a/.github/workflows/bootstrap.yaml +++ b/.github/workflows/bootstrap.yaml @@ -38,6 +38,7 @@ jobs: - if: runner.os == 'Linux' name: Run bootstrap run: | + sudo apt-get update -y sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip sh ./.github/scripts/bootstrap.sh env: diff --git a/.github/workflows/cabal.project.yaml b/.github/workflows/cabal.project.yaml index b0f7523b..8c094a67 100644 --- a/.github/workflows/cabal.project.yaml +++ b/.github/workflows/cabal.project.yaml @@ -41,7 +41,7 @@ jobs: - if: runner.os == 'Linux' name: Install prerequisites run: | - sudo apt update + sudo apt update -y sudo apt install -y libbz2-dev - name: Install GHCup diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 23b65576..4200e582 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -323,6 +323,7 @@ jobs: - if: matrix.DISTRO != 'Alpine' name: Run test (64 bit linux) run: | + sudo apt update -y sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip sh .github/scripts/test.sh env: @@ -534,6 +535,7 @@ jobs: - name: Run hls build run: | + sudo apt update -y sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl gzip sh .github/scripts/hls.sh diff --git a/.github/workflows/stack.yaml b/.github/workflows/stack.yaml index 59837a9a..8061a7ed 100644 --- a/.github/workflows/stack.yaml +++ b/.github/workflows/stack.yaml @@ -29,7 +29,7 @@ jobs: - if: runner.os == 'Linux' name: Install prerequisites run: | - sudo apt update + sudo apt update -y sudo apt install -y libbz2-dev - name: Install GHCup From cab2ae59eb3efe6d7e30867048c5259b5192e4f6 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 10 Apr 2025 16:05:49 +0800 Subject: [PATCH 3/3] Compile with GHC 9.10.1 --- .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 4200e582..cf13524d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 9.6.7 + GHC_VER: 9.10.1 ARCH: 32 - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" @@ -272,7 +272,7 @@ jobs: include: - os: ubuntu-latest ARTIFACT: "i386-linux-ghcup" - GHC_VER: 9.6.7 + GHC_VER: 9.10.1 ARCH: 32 DISTRO: Alpine - os: ubuntu-latest