Skip to content

Commit ab0224f

Browse files
committed
Generate new release CI and update github actions
Fixes #4753 and #4747
1 parent d3bcb98 commit ab0224f

File tree

3 files changed

+838
-195
lines changed

3 files changed

+838
-195
lines changed

.github/generate-ci/gen_ci.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ data GHC
6666
| GHC984
6767
| GHC9103
6868
| GHC9122
69+
| GHC9141
6970
deriving (Eq, Enum, Bounded)
7071

7172
ghcVersion :: GHC -> String
7273
ghcVersion GHC967 = "9.6.7"
7374
ghcVersion GHC984 = "9.8.4"
7475
ghcVersion GHC9103 = "9.10.3"
7576
ghcVersion GHC9122 = "9.12.2"
77+
ghcVersion GHC9141 = "9.14.1"
7678

7779
ghcVersionIdent :: GHC -> String
7880
ghcVersionIdent = filter (/= '.') . ghcVersion
@@ -607,12 +609,12 @@ checkoutAction :: Value
607609
checkoutAction = ghAction "Checkout" "actions/checkout@v4" [] []
608610

609611
uploadArtifacts :: String -> String -> Value
610-
uploadArtifacts name path = ghAction "Upload artifact" "actions/upload-artifact@v4"
612+
uploadArtifacts name path = ghAction "Upload artifact" "actions/upload-artifact@v5"
611613
[ "if-no-files-found" .= str "error"
612614
, "retention-days" .= (2 :: Int)
613615
, "name" .= name
614616
, "path" .= path
615617
] []
616618

617619
downloadArtifacts :: String -> String -> Value
618-
downloadArtifacts name path = ghAction "Download artifacts" "actions/download-artifact@v4" [ "name" .= name, "path" .= path ] []
620+
downloadArtifacts name path = ghAction "Download artifacts" "actions/download-artifact@v6" [ "name" .= name, "path" .= path ] []

.github/workflows/bench.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ jobs:
100100
tar -czf cabal.tar.gz *
101101
102102
- name: Upload workspace
103-
uses: actions/upload-artifact@v4
103+
uses: actions/upload-artifact@v5
104104
with:
105105
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
106106
retention-days: 1
107107
path: workspace.tar.gz
108108

109109
- name: Upload .cabal
110-
uses: actions/upload-artifact@v4
110+
uses: actions/upload-artifact@v5
111111
with:
112112
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
113113
retention-days: 1
@@ -134,13 +134,13 @@ jobs:
134134
enable-stack: false
135135

136136
- name: Download cabal home
137-
uses: actions/download-artifact@v4
137+
uses: actions/download-artifact@v6
138138
with:
139139
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
140140
path: .
141141

142142
- name: Download workspace
143-
uses: actions/download-artifact@v4
143+
uses: actions/download-artifact@v6
144144
with:
145145
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
146146
path: .
@@ -165,7 +165,7 @@ jobs:
165165
run: find bench-results -name "*.csv" -or -name "*.svg" -or -name "*.html" | xargs tar -czf benchmark-artifacts.tar.gz
166166

167167
- name: Archive benchmarking artifacts
168-
uses: actions/upload-artifact@v4
168+
uses: actions/upload-artifact@v5
169169
with:
170170
name: bench-results-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
171171
path: benchmark-artifacts.tar.gz
@@ -175,7 +175,7 @@ jobs:
175175
run: find bench-results -name "*.log" -or -name "*.hp" | xargs tar -czf benchmark-logs.tar.gz
176176

177177
- name: Archive benchmark logs
178-
uses: actions/upload-artifact@v4
178+
uses: actions/upload-artifact@v6
179179
with:
180180
name: bench-logs-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
181181
path: benchmark-logs.tar.gz

0 commit comments

Comments
 (0)