Skip to content

Commit

Permalink
Merge pull request #596 from IntersectMBO/mgalazyn/chore/fix-month-nu…
Browse files Browse the repository at this point in the history
…mber-in-gha-cache

      Fix missing month number in GHA cache key. Use the latest patch of toolchain tools
  • Loading branch information
carbolymer authored Jul 30, 2024
2 parents aee2131 + b45ad0e commit fbd4f0c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.6.4", "9.8.1"]
cabal: ["3.10.2.0"]
ghc: ["8.10.7", "9.6", "9.8"]
cabal: ["3.12"]
sys:
- { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }
- { os: ubuntu-latest, shell: bash }
include:
# Using include, to make sure there will only be one macOS job, even if the matrix gets expanded later on.
# We want a single job, because macOS runners are scarce.
- cabal: "3.10.2.0"
ghc: "9.6.4"
- cabal: "3.12"
ghc: "9.6"
sys:
os: macos-latest
shell: bash
Expand All @@ -40,7 +40,7 @@ jobs:

env:
# Modify this value to "invalidate" the cabal cache.
CABAL_CACHE_VERSION: "2024-02-29-golden"
CABAL_CACHE_VERSION: "2024-07-26"
# these two are msys2 env vars, they have no effect on non-msys2 installs.
MSYS2_PATH_TYPE: inherit
MSYSTEM: MINGW64
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
# Use a fresh cache each month
- name: Store month number as environment variable used in cache version
run: echo "MONTHNUM=$(/usr/bin/date -u '+%m')" >> $GITHUB_ENV
run: echo "MONTHNUM=$(date -u '+%m')" >> $GITHUB_ENV

# From the dependency list we restore the cached dependencies.
# We use the hash of `dependencies.txt` as part of the cache key because that will be stable
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
${{ steps.setup-haskell.outputs.cabal-store }}
dist-newstyle
key:
cache-${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ env.MONTHNUM }}-${{ hashFiles('dependencies.txt') }}
${{ steps.cache.outputs.cache-primary-key }}

# Now we build.
- name: Build all
Expand Down

0 comments on commit fbd4f0c

Please sign in to comment.