Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert GHC 9.10.1 update #3052

Merged
merged 4 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 1 addition & 37 deletions .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 Expand Up @@ -77,42 +77,6 @@ jobs:
build-and-test-linux:
runs-on: ubuntu-22.04
steps:
- name: Free disk space
run: |
df -h
echo "/usr/local"
du -hsc /usr/local/*
sudo rm -rf \
/usr/local/aws-sam-cil \
/usr/local/julia* || :
echo "end /usr/local"
echo "/usr/local/lib"
du -hsc /usr/local/lib/*
sudo rm -rf \
/usr/local/lib/android \
/usr/local/lib/heroku \
/usr/local/lib/node_modules || :
echo "end /usr/local/lib"
echo "/usr/local/share"
du -hsc /usr/local/share/*
sudo rm -rf \
/usr/local/share/chromium \
/usr/local/share/powershell || :
echo "end /usr/local/share"
echo "/opt/hostedtoolcache/"
du -hsc /opt/hostedtoolcache/*
sudo rm -rf \
/opt/hostedtoolcache/CodeQL \
/opt/hostedtoolcache/go \
/opt/hostedtoolcache/PyPy \
/opt/hostedtoolcache/node || :
echo "end /opt/hostedtoolcache/*"
sudo apt purge -y \
firefox \
google-chrome-stable \
microsoft-edge-stable
df -h

- uses: extractions/setup-just@v2

- name: Checkout our repository
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
Loading