feat: upgrade to latest stackage LTS (GHC 9.8.4)

spex-lang · Dec 10, 2024 · 64ac116 · 64ac116
1 parent 51ce786
commit 64ac116
Show file tree

Hide file tree

Showing 8 changed files with 698 additions and 884 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GHC_VERSION=9.6.6
+ARG GHC_VERSION=9.8.4
 ARG CABAL_VERSION=3.12.1.0
 
 FROM docker.io/library/alpine:3.20 AS build
@@ -69,7 +69,7 @@ RUN  rm -r /root/.ghcup/cache \
   && rm -r /root/.ghcup/ghc/$GHC_VERSION/lib/ghc-$GHC_VERSION/lib/latex \
   && rm -r /root/.ghcup/ghc/$GHC_VERSION/lib/ghc-$GHC_VERSION/lib/llvm-* \
   && rm -r /root/.ghcup/ghc/$GHC_VERSION/share \
-  && rm -r /root/.ghcup/ghc/$GHC_VERSION/lib/ghc-$GHC_VERSION/lib/x86_64-linux-ghc-$GHC_VERSION/ghc-$GHC_VERSION \
+  && rm -r /root/.ghcup/ghc/$GHC_VERSION/lib/ghc-$GHC_VERSION/lib/x86_64-linux-ghc-$GHC_VERSION/ghc-$GHC_VERSION-04ad \
   && rm -r /root/.ghcup/ghc/$GHC_VERSION/lib/ghc-$GHC_VERSION/lib/x86_64-linux-ghc-$GHC_VERSION/Cabal-* \
   && find /root/.ghcup/ -name '*.p_hi' -delete \
   && find /root/.ghcup/ -name '*_p.a' -delete \

diff --git a/INSTALL.md b/INSTALL.md
@@ -62,7 +62,7 @@ then issue:
 git clone https://github.com/spex-lang/spex.git
 cd spex
 ghcup install cabal 3.12.1.0 --set
-ghcup install ghc 9.6.6 --set
+ghcup install ghc 9.8.4 --set
 cabal build all
 cabal install spex spex-demo-petstore
 ```

diff --git a/Makefile b/Makefile
@@ -265,8 +265,9 @@ GITHUB_EVENT_BEFORE ?= origin/main
 GITHUB_EVENT_AFTER  ?= HEAD
 
 DOCKERFILE_CHANGED := $(shell \
-	git diff --name-only "$(GITHUB_EVENT_BEFORE)" "$(GITHUB_EVENT_AFTER)" \
-	| grep --quiet "^Dockerfile$$" && echo true || echo false)
+	(git diff --name-only "$(GITHUB_EVENT_BEFORE)" "$(GITHUB_EVENT_AFTER)" \
+	| grep --quiet "^Dockerfile$$" || \
+        ! git diff --quiet Dockerfile) && echo true || echo false)
 
 .PHONY: pull-image build-image push-image
 
@@ -278,7 +279,7 @@ pull-image:
 build-image: 
 	echo "GITHUB_EVENT_AFTER=$(GITHUB_EVENT_AFTER)" 
 	echo "GITHUB_EVENT_BEFORE=$(GITHUB_EVENT_BEFORE)"
-	echo "git diff=$(shell git diff --name-only $(GITHUB_EVENT_AFTER) $(GITHUB_EVENT_BEFORE))"
+	echo "git diff=$(shell git diff --name-only $(GITHUB_EVENT_BEFORE) $(GITHUB_EVENT_AFTER))"
 	echo "DOCKERFILE_CHANGED=$(DOCKERFILE_CHANGED)"
   ifeq ($(DOCKERFILE_CHANGED),true)
 	docker build --tag ghcr.io/spex-lang/spex-build:latest .

diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
 packages: ./*.cabal
 optional-packages: ./example/*/*.cabal
 
-index-state: hackage.haskell.org @1729577343
+index-state: hackage.haskell.org @1733800000