File tree Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Expand file tree Collapse file tree 2 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -57,21 +57,21 @@ jobs:
57
57
- uses : actions/checkout@v2
58
58
with :
59
59
submodules : true
60
+
60
61
- uses : haskell/actions/setup@v1
62
+ id : HaskEnvSetup
61
63
with :
62
64
ghc-version : ${{ matrix.ghc }}
63
65
cabal-version : " 3.4"
64
66
65
67
- if : matrix.os == 'windows-latest'
66
68
name : Set some window specific things
67
69
run : |
68
- echo "CABAL_STORE_DIR=$SYSTEMDRIVE\\SR" >> $GITHUB_ENV
69
70
echo "CABAL_PKGS_DIR=~\\AppData\\cabal\\packages" >> $GITHUB_ENV
70
71
71
72
- if : (${{ env.RUNNER_OS }} == 'Linux') || (${{ env.RUNNER_OS}} == 'macOS')
72
73
name : Set some Linux/macOS specific things
73
74
run : |
74
- echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
75
75
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
76
76
77
77
- if : matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
97
97
cache-name : cache-cabal
98
98
with :
99
99
path : |
100
+ ${{ steps.HaskEnvSetup.outputs.cabal-store }}
100
101
${{ env.CABAL_PKGS_DIR }}
101
- ${{ env.CABAL_STORE_DIR }}
102
102
key : v2-${{ runner.os }}-${{ matrix.ghc }}-build-${{ hashFiles('cabal.project') }}
103
103
restore-keys : v2-${{ runner.os }}-${{ matrix.ghc }}-build-
104
104
Original file line number Diff line number Diff line change 78
78
with :
79
79
submodules : true
80
80
- uses : haskell/actions/setup@v1
81
+ id : HaskEnvSetup
81
82
with :
82
83
ghc-version : ${{ matrix.ghc }}
83
84
cabal-version : " 3.4"
@@ -88,14 +89,12 @@ jobs:
88
89
- if : ${{ env.RUNNER_OS }} == 'Windows'
89
90
name : Set some window specific things
90
91
run : |
91
- echo "CABAL_STORE_DIR=$SYSTEMDRIVE\\SR" >> $GITHUB_ENV
92
92
echo "CABAL_PKGS_DIR=~\\AppData\\cabal\\packages" >> $GITHUB_ENV
93
93
94
94
95
95
- if : (${{ env.RUNNER_OS }} == 'Linux') || (${{ env.RUNNER_OS}} == 'macOS')
96
96
name : Set some Linux/macOS specific things
97
97
run : |
98
- echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
99
98
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
100
99
101
100
- if : matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
@@ -121,8 +120,8 @@ jobs:
121
120
cache-name : cache-cabal
122
121
with :
123
122
path : |
123
+ ${{ steps.HaskEnvSetup.outputs.cabal-store }}
124
124
${{ env.CABAL_PKGS_DIR }}
125
- ${{ env.CABAL_STORE_DIR }}
126
125
restore-keys : v2-${{ runner.os }}-${{ matrix.ghc }}-build-
127
126
128
127
- run : cabal update
You can’t perform that action at this time.
0 commit comments