From 9d4620a947d23dc1e8f0f00201cd89b030212057 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Tue, 4 Jun 2024 14:31:43 -0400 Subject: [PATCH] Use the STACKAGE_VERSION for scripts --- .github/workflows/stack.yml | 5 ----- project-files.mk | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 7ca1818..a60d476 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -30,11 +30,6 @@ jobs: enable-stack: true stack-version: '2.15.7' - - name: Set up GHC 8.10.7 for scripts - uses: haskell-actions/setup@v2 - with: - ghc-version: "8.10.7" - - name: Configure stack run: | stack config set system-ghc --global true diff --git a/project-files.mk b/project-files.mk index 04a70fe..72eed4c 100644 --- a/project-files.mk +++ b/project-files.mk @@ -54,3 +54,5 @@ updo/Makefile: curl -sSL ${UPDO_URL} | tar -xz mv updo-* updo chmod +x $$(grep -RIl '^#!' updo) + grep -RIl '^#!' updo \ + | xargs sed --in-place -E 's/--resolver=(nightly-[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}|lts-[[:digit:]]+\.[[:digit:]]+)/--resolver=$(STACKAGE_VERSION)/g' \ No newline at end of file