Skip to content

Commit 90035ea

Browse files
author
Gunter Schmidt
committed
try fix github check release
The tool dist does not allow different repository names within the workspace.
1 parent 77dd93b commit 90035ea

5 files changed

Lines changed: 28 additions & 25 deletions

File tree

.github/workflows/release.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ jobs:
5656
env:
5757
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v6
6060
with:
6161
persist-credentials: false
6262
submodules: recursive
6363
- name: Install dist
6464
# we specify bash to get pipefail; it guards against the `curl` command
6565
# failing. otherwise `sh` won't catch that `curl` returned non-0
6666
shell: bash
67-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.3/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.31.0/cargo-dist-installer.sh | sh"
6868
- name: Cache dist
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@v6
7070
with:
7171
name: cargo-dist-cache
7272
path: ~/.cargo/bin/dist
@@ -82,7 +82,7 @@ jobs:
8282
cat plan-dist-manifest.json
8383
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
8484
- name: "Upload dist-manifest.json"
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8686
with:
8787
name: artifacts-plan-dist-manifest
8888
path: plan-dist-manifest.json
@@ -116,7 +116,7 @@ jobs:
116116
- name: enable windows longpaths
117117
run: |
118118
git config --global core.longpaths true
119-
- uses: actions/checkout@v4
119+
- uses: actions/checkout@v6
120120
with:
121121
persist-credentials: false
122122
submodules: recursive
@@ -131,7 +131,7 @@ jobs:
131131
run: ${{ matrix.install_dist.run }}
132132
# Get the dist-manifest
133133
- name: Fetch local artifacts
134-
uses: actions/download-artifact@v4
134+
uses: actions/download-artifact@v7
135135
with:
136136
pattern: artifacts-*
137137
path: target/distrib/
@@ -158,7 +158,7 @@ jobs:
158158
159159
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
160160
- name: "Upload artifacts"
161-
uses: actions/upload-artifact@v4
161+
uses: actions/upload-artifact@v6
162162
with:
163163
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
164164
path: |
@@ -175,19 +175,19 @@ jobs:
175175
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
176176
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
177177
steps:
178-
- uses: actions/checkout@v4
178+
- uses: actions/checkout@v6
179179
with:
180180
persist-credentials: false
181181
submodules: recursive
182182
- name: Install cached dist
183-
uses: actions/download-artifact@v4
183+
uses: actions/download-artifact@v7
184184
with:
185185
name: cargo-dist-cache
186186
path: ~/.cargo/bin/
187187
- run: chmod +x ~/.cargo/bin/dist
188188
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
189189
- name: Fetch local artifacts
190-
uses: actions/download-artifact@v4
190+
uses: actions/download-artifact@v7
191191
with:
192192
pattern: artifacts-*
193193
path: target/distrib/
@@ -205,7 +205,7 @@ jobs:
205205
206206
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
207207
- name: "Upload artifacts"
208-
uses: actions/upload-artifact@v4
208+
uses: actions/upload-artifact@v6
209209
with:
210210
name: artifacts-build-global
211211
path: |
@@ -225,19 +225,19 @@ jobs:
225225
outputs:
226226
val: ${{ steps.host.outputs.manifest }}
227227
steps:
228-
- uses: actions/checkout@v4
228+
- uses: actions/checkout@v6
229229
with:
230230
persist-credentials: false
231231
submodules: recursive
232232
- name: Install cached dist
233-
uses: actions/download-artifact@v4
233+
uses: actions/download-artifact@v7
234234
with:
235235
name: cargo-dist-cache
236236
path: ~/.cargo/bin/
237237
- run: chmod +x ~/.cargo/bin/dist
238238
# Fetch artifacts from scratch-storage
239239
- name: Fetch artifacts
240-
uses: actions/download-artifact@v4
240+
uses: actions/download-artifact@v7
241241
with:
242242
pattern: artifacts-*
243243
path: target/distrib/
@@ -250,14 +250,14 @@ jobs:
250250
cat dist-manifest.json
251251
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
252252
- name: "Upload dist-manifest.json"
253-
uses: actions/upload-artifact@v4
253+
uses: actions/upload-artifact@v6
254254
with:
255255
# Overwrite the previous copy
256256
name: artifacts-dist-manifest
257257
path: dist-manifest.json
258258
# Create a GitHub Release while uploading all files to it
259259
- name: "Download GitHub Artifacts"
260-
uses: actions/download-artifact@v4
260+
uses: actions/download-artifact@v7
261261
with:
262262
pattern: artifacts-*
263263
path: artifacts
@@ -290,7 +290,7 @@ jobs:
290290
env:
291291
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
292292
steps:
293-
- uses: actions/checkout@v4
293+
- uses: actions/checkout@v6
294294
with:
295295
persist-credentials: false
296296
submodules: recursive

Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@ inherits = "release"
144144
panic = "unwind"
145145
debug = true
146146

147-
#
148-
# # The profile that 'dist' will build with
149-
# [profile.dist]
150-
# inherits = "release"
151-
# lto = "thin"
147+
# The profile that 'dist' will build with
148+
[profile.dist]
149+
inherits = "release"
150+
lto = "thin"
152151

153152
# [lints]
154153
# workspace = true

dist-workspace.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ members = ["cargo:."]
44
# Config for 'dist'
55
[dist]
66
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
7-
cargo-dist-version = "0.30.3"
7+
cargo-dist-version = "0.31.0"
88
# CI backends to support
99
ci = "github"
1010
# The installers to generate for each app

src/uu/cmp/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[package]
22
name = "uu_cmp"
33
description = "cmp ~ (uutils) decode/encode input (cmp file compare)"
4-
repository = "https://github.com/uutils/diffutils/tree/main/src/uu/cmp"
4+
# The tool dist does not allow different repository names within the workspace.
5+
repository = "https://github.com/uutils/diffutils"
6+
# repository = "https://github.com/uutils/diffutils/tree/main/src/uu/cmp"
57
version.workspace = true
68
authors.workspace = true
79
license.workspace = true

src/uu/diff/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[package]
22
name = "uu_diff"
33
description = "diff ~ (uutils) decode/encode input (diff file compare)"
4-
repository = "https://github.com/uutils/diffutils/tree/main/src/uu/diff"
4+
# The tool dist does not allow different repository names within the workspace.
5+
# repository = "https://github.com/uutils/diffutils/tree/main/src/uu/diff"
6+
repository = "https://github.com/uutils/diffutils"
57
version.workspace = true
68
authors.workspace = true
79
license.workspace = true

0 commit comments

Comments
 (0)