Try installing ghc multiple times

cabalism · May 22, 2024 · c7e46b4 · c7e46b4
1 parent 2b7d42e
commit c7e46b4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -19,6 +19,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - name: Set up GHC 8.10.7 for scripts
+      uses: haskell-actions/setup@v2
+      with:
+        ghc-version: "8.10.7"
+
     - name: Set up GHC and cabal-install
       uses: haskell-actions/setup@v2
       id: setup

diff --git a/project-files.mk b/project-files.mk
@@ -7,10 +7,10 @@ CABAL_VIA ?= dhall2cabal
 SHA256MAP_VIA_PYTHON ?= false
 
 # To use installed executables instead of *.hs scripts, set these to true.
-SHA256MAP_HS_EXE ?= true
-PKG_GROUPS_HS_EXE ?= true
-PKGS_SORTED_HS_EXE ?= true
-PKGS_UPGRADE_DONE_HS_EXE ?= true
+SHA256MAP_HS_EXE ?= false
+PKG_GROUPS_HS_EXE ?= false
+PKGS_SORTED_HS_EXE ?= false
+PKGS_UPGRADE_DONE_HS_EXE ?= false
 
 include project-versions.mk
 include updo/Makefile
@@ -53,4 +53,4 @@ updo/Makefile:
 	rm -rf updo
 	curl -sSL ${UPDO_URL} | tar -xz
 	mv updo-* updo
-	cabal install updo:exes --overwrite-policy=always --project-file=updo.project --with-compiler=ghc-$(GHC_VERSION)
+	chmod +x $$(grep -RIl '^#!' updo)