Skip to content

Commit 4c53d9f

Browse files
authored
Merge pull request #94 from wakatime/fix/dist-failed
add arm windows
2 parents d4d94f5 + f547eb5 commit 4c53d9f

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
1+
# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
22
#
33
# Copyright 2022-2024, axodotdev
44
# SPDX-License-Identifier: MIT or Apache-2.0
@@ -58,12 +58,13 @@ jobs:
5858
steps:
5959
- uses: actions/checkout@v4
6060
with:
61+
persist-credentials: false
6162
submodules: recursive
6263
- name: Install dist
6364
# we specify bash to get pipefail; it guards against the `curl` command
6465
# failing. otherwise `sh` won't catch that `curl` returned non-0
6566
shell: bash
66-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.28.0/cargo-dist-installer.sh | sh"
67+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh"
6768
- name: Cache dist
6869
uses: actions/upload-artifact@v4
6970
with:
@@ -117,6 +118,7 @@ jobs:
117118
git config --global core.longpaths true
118119
- uses: actions/checkout@v4
119120
with:
121+
persist-credentials: false
120122
submodules: recursive
121123
- name: Install Rust non-interactively if not already installed
122124
if: ${{ matrix.container }}
@@ -129,7 +131,7 @@ jobs:
129131
run: ${{ matrix.install_dist.run }}
130132
# Get the dist-manifest
131133
- name: Fetch local artifacts
132-
uses: actions/download-artifact@v6
134+
uses: actions/download-artifact@v4
133135
with:
134136
pattern: artifacts-*
135137
path: target/distrib/
@@ -175,16 +177,17 @@ jobs:
175177
steps:
176178
- uses: actions/checkout@v4
177179
with:
180+
persist-credentials: false
178181
submodules: recursive
179182
- name: Install cached dist
180-
uses: actions/download-artifact@v6
183+
uses: actions/download-artifact@v4
181184
with:
182185
name: cargo-dist-cache
183186
path: ~/.cargo/bin/
184187
- run: chmod +x ~/.cargo/bin/dist
185188
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
186189
- name: Fetch local artifacts
187-
uses: actions/download-artifact@v6
190+
uses: actions/download-artifact@v4
188191
with:
189192
pattern: artifacts-*
190193
path: target/distrib/
@@ -214,8 +217,8 @@ jobs:
214217
- plan
215218
- build-local-artifacts
216219
- build-global-artifacts
217-
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
218-
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
220+
# Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
221+
if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
219222
env:
220223
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
221224
runs-on: "ubuntu-22.04"
@@ -224,16 +227,17 @@ jobs:
224227
steps:
225228
- uses: actions/checkout@v4
226229
with:
230+
persist-credentials: false
227231
submodules: recursive
228232
- name: Install cached dist
229-
uses: actions/download-artifact@v6
233+
uses: actions/download-artifact@v4
230234
with:
231235
name: cargo-dist-cache
232236
path: ~/.cargo/bin/
233237
- run: chmod +x ~/.cargo/bin/dist
234238
# Fetch artifacts from scratch-storage
235239
- name: Fetch artifacts
236-
uses: actions/download-artifact@v6
240+
uses: actions/download-artifact@v4
237241
with:
238242
pattern: artifacts-*
239243
path: target/distrib/
@@ -253,7 +257,7 @@ jobs:
253257
path: dist-manifest.json
254258
# Create a GitHub Release while uploading all files to it
255259
- name: "Download GitHub Artifacts"
256-
uses: actions/download-artifact@v6
260+
uses: actions/download-artifact@v4
257261
with:
258262
pattern: artifacts-*
259263
path: artifacts
@@ -288,4 +292,5 @@ jobs:
288292
steps:
289293
- uses: actions/checkout@v4
290294
with:
295+
persist-credentials: false
291296
submodules: recursive

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.28.0"
7+
cargo-dist-version = "0.30.2"
88
# CI backends to support
99
ci = "github"
1010
# The archive format to use for non-windows builds (defaults .tar.xz)

0 commit comments

Comments
 (0)