Skip to content

Commit

Permalink
Revert GHC 9.10.1 update (#3052)
Browse files Browse the repository at this point in the history
We cannot build linux static binaries with GHC 9.10.1:

* #3037

This PR reverts the GHC update to unblock Juvix releases / nightly
releases. We can try the update again when stackage nightly updates to
GHC 9.10.1.
  • Loading branch information
paulcadman authored Sep 19, 2024
1 parent 66427cd commit 0d18294
Show file tree
Hide file tree
Showing 8 changed files with 163 additions and 2,953 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
CAIRO_VM_VERSION: 06e8ddbfa14eef85f56c4d7b7631c17c9b0a248e
RISC0_VM_VERSION: v1.0.1
JUST_ARGS: runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j --stack-yaml=stack.yaml
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j

jobs:
pre-commit:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux-static-binary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ on:
default: "main"

env:
STACK_VERSION: 3.1.1
STACK_VERSION: 2.11.1

jobs:
build:
name: Build static binary
runs-on: ubuntu-latest
container: quay.io/benz0li/ghc-musl:9.10.1
container: quay.io/benz0li/ghc-musl:9.8.2
steps:
- name: checkout code
uses: actions/checkout@v3
Expand All @@ -33,7 +33,7 @@ jobs:

- name: install stack
run: |
TAR_BASE_NAME=stack-$STACK_VERSION-linux-x86_64
TAR_BASE_NAME=stack-$STACK_VERSION-linux-x86_64-static
TAR_FILE_NAME=$TAR_BASE_NAME.tar.gz
curl https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/$TAR_FILE_NAME -OL
tar xf $TAR_FILE_NAME
Expand Down
8 changes: 1 addition & 7 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Generated by stack2cabal

with-compiler: ghc-9.10.1
with-compiler: ghc-9.8.2

packages:
./
Expand All @@ -10,12 +10,6 @@ source-repository-package
location: https://github.com/Vekhir/aeson-better-errors.git
tag: 1ec49ab7d1472046b680b5a64ae2930515b47714

source-repository-package
type: git
location: https://github.com/haskell-effectful/effectful.git
tag: 2a8f0b3a0536c578ee1ff83311863a27e9d3e2e1
subdir: effectful-th

allow-older: *
allow-newer: *

Expand Down
Loading

0 comments on commit 0d18294

Please sign in to comment.