From 161193d39d4e74f265ac322c8dc4f7f1f06e68b5 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Wed, 22 May 2024 16:01:28 -0400 Subject: [PATCH] Try installing ghc multiple times --- .github/workflows/stack.yml | 6 ++++++ project-files.mk | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 6068b12..1f52888 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -19,6 +19,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set up GHC 8.10.7 for scripts + uses: haskell-actions/setup@v2 + id: setup + 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 index 2d2d185..04a70fe 100644 --- 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)