From 3206b0e2787510778f47dfc3c707980e048e040d Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 10 Mar 2023 19:02:34 -1000 Subject: [PATCH] ci: minor updates --- .github/workflows/binaries-linux-x64-static.yml | 8 ++++---- .github/workflows/binaries-mac-x64.yml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/binaries-linux-x64-static.yml b/.github/workflows/binaries-linux-x64-static.yml index d3f4058ce..9b8e2b1ce 100644 --- a/.github/workflows/binaries-linux-x64-static.yml +++ b/.github/workflows/binaries-linux-x64-static.yml @@ -33,18 +33,18 @@ jobs: uses: actions/cache@v3 with: path: ~/.ghcup - key: ${{ runner.os }}-ghcup-20220829-${{ hashFiles('**.yaml') }} + key: ${{ runner.os }}-ghcup-${{ hashFiles('**.yaml') }} restore-keys: | - ${{ runner.os }}-ghcup-20220829 + ${{ runner.os }}-ghcup - name: Cache cabal-installed libs id: cabal uses: actions/cache@v3 with: path: ~/.cabal - key: ${{ runner.os }}-cabal-20220829-${{ hashFiles('**.yaml') }} + key: ${{ runner.os }}-cabal-${{ hashFiles('**.yaml') }} restore-keys: | - ${{ runner.os }}-cabal-20220829 + ${{ runner.os }}-cabal - name: Install general tools with system package manager run: | diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml index 437d17577..b02267b2a 100644 --- a/.github/workflows/binaries-mac-x64.yml +++ b/.github/workflows/binaries-mac-x64.yml @@ -21,7 +21,8 @@ jobs: # - { ghc: "810" , stack: "stack --stack-yaml=stack8.10.yaml" } # XXX func tests in bin should be run only with GHC 8.10 for now (see shelltest below) (?) # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } - - { ghc: "92" , stack: "stack --stack-yaml=stack.yaml" } + # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } + - { ghc: "94" , stack: "stack --stack-yaml=stack.yaml" } steps: