Reapply "feat(release): upgrade cargo-dist to 0.13.1"
This reverts commit 59e13ae79d
.
This commit is contained in:
parent
59e13ae79d
commit
ff153e3c04
|
@ -1,4 +1,4 @@
|
||||||
# Copyright 2022-2023, axodotdev
|
# Copyright 2022-2024, axodotdev
|
||||||
# SPDX-License-Identifier: MIT or Apache-2.0
|
# SPDX-License-Identifier: MIT or Apache-2.0
|
||||||
#
|
#
|
||||||
# CI that:
|
# CI that:
|
||||||
|
@ -6,9 +6,9 @@
|
||||||
# * checks for a Git Tag that looks like a release
|
# * checks for a Git Tag that looks like a release
|
||||||
# * builds artifacts with cargo-dist (archives, installers, hashes)
|
# * builds artifacts with cargo-dist (archives, installers, hashes)
|
||||||
# * uploads those artifacts to temporary workflow zip
|
# * uploads those artifacts to temporary workflow zip
|
||||||
# * on success, uploads the artifacts to a Github Release
|
# * on success, uploads the artifacts to a GitHub Release
|
||||||
#
|
#
|
||||||
# Note that the Github Release will be created with a generated
|
# Note that the GitHub Release will be created with a generated
|
||||||
# title/body based on your changelogs.
|
# title/body based on your changelogs.
|
||||||
|
|
||||||
name: Release
|
name: Release
|
||||||
|
@ -31,7 +31,7 @@ permissions:
|
||||||
# packages versioned/released in lockstep).
|
# packages versioned/released in lockstep).
|
||||||
#
|
#
|
||||||
# If you push multiple tags at once, separate instances of this workflow will
|
# If you push multiple tags at once, separate instances of this workflow will
|
||||||
# spin up, creating an independent announcement for each one. However Github
|
# spin up, creating an independent announcement for each one. However, GitHub
|
||||||
# will hard limit this to 3 tags per commit, as it will assume more tags is a
|
# will hard limit this to 3 tags per commit, as it will assume more tags is a
|
||||||
# mistake.
|
# mistake.
|
||||||
#
|
#
|
||||||
|
@ -62,7 +62,7 @@ jobs:
|
||||||
# we specify bash to get pipefail; it guards against the `curl` command
|
# we specify bash to get pipefail; it guards against the `curl` command
|
||||||
# failing. otherwise `sh` won't catch that `curl` returned non-0
|
# failing. otherwise `sh` won't catch that `curl` returned non-0
|
||||||
shell: bash
|
shell: bash
|
||||||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.8.2/cargo-dist-installer.sh | sh"
|
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.1/cargo-dist-installer.sh | sh"
|
||||||
# sure would be cool if github gave us proper conditionals...
|
# sure would be cool if github gave us proper conditionals...
|
||||||
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
|
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
|
||||||
# functionality based on whether this is a pull_request, and whether it's from a fork.
|
# functionality based on whether this is a pull_request, and whether it's from a fork.
|
||||||
|
@ -70,15 +70,15 @@ jobs:
|
||||||
# but also really annoying to build CI around when it needs secrets to work right.)
|
# but also really annoying to build CI around when it needs secrets to work right.)
|
||||||
- id: plan
|
- id: plan
|
||||||
run: |
|
run: |
|
||||||
cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > dist-manifest.json
|
cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
|
||||||
echo "cargo dist ran successfully"
|
echo "cargo dist ran successfully"
|
||||||
cat dist-manifest.json
|
cat plan-dist-manifest.json
|
||||||
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
|
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
|
||||||
- name: "Upload dist-manifest.json"
|
- name: "Upload dist-manifest.json"
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
name: artifacts-plan-dist-manifest
|
||||||
path: dist-manifest.json
|
path: plan-dist-manifest.json
|
||||||
|
|
||||||
# Build and packages all the platform-specific things
|
# Build and packages all the platform-specific things
|
||||||
build-local-artifacts:
|
build-local-artifacts:
|
||||||
|
@ -109,14 +109,17 @@ jobs:
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- uses: swatinem/rust-cache@v2
|
- uses: swatinem/rust-cache@v2
|
||||||
|
with:
|
||||||
|
key: ${{ join(matrix.targets, '-') }}
|
||||||
- name: Install cargo-dist
|
- name: Install cargo-dist
|
||||||
run: ${{ matrix.install_dist }}
|
run: ${{ matrix.install_dist }}
|
||||||
# Get the dist-manifest
|
# Get the dist-manifest
|
||||||
- name: Fetch local artifacts
|
- name: Fetch local artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
pattern: artifacts-*
|
||||||
path: target/distrib/
|
path: target/distrib/
|
||||||
|
merge-multiple: true
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
${{ matrix.packages_install }}
|
${{ matrix.packages_install }}
|
||||||
|
@ -134,14 +137,14 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
# Parse out what we just built and upload it to scratch storage
|
# Parse out what we just built and upload it to scratch storage
|
||||||
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
|
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
|
||||||
jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT"
|
jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
|
||||||
echo "EOF" >> "$GITHUB_OUTPUT"
|
echo "EOF" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
|
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
|
||||||
- name: "Upload artifacts"
|
- name: "Upload artifacts"
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
name: artifacts-build-local-${{ join(matrix.targets, '_') }}
|
||||||
path: |
|
path: |
|
||||||
${{ steps.cargo-dist.outputs.paths }}
|
${{ steps.cargo-dist.outputs.paths }}
|
||||||
${{ env.BUILD_MANIFEST_NAME }}
|
${{ env.BUILD_MANIFEST_NAME }}
|
||||||
|
@ -160,13 +163,15 @@ jobs:
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Install cargo-dist
|
- name: Install cargo-dist
|
||||||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.8.2/cargo-dist-installer.sh | sh"
|
shell: bash
|
||||||
|
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.1/cargo-dist-installer.sh | sh"
|
||||||
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
|
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
|
||||||
- name: Fetch local artifacts
|
- name: Fetch local artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
pattern: artifacts-*
|
||||||
path: target/distrib/
|
path: target/distrib/
|
||||||
|
merge-multiple: true
|
||||||
- id: cargo-dist
|
- id: cargo-dist
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
@ -175,14 +180,14 @@ jobs:
|
||||||
|
|
||||||
# Parse out what we just built and upload it to scratch storage
|
# Parse out what we just built and upload it to scratch storage
|
||||||
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
|
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
|
||||||
jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT"
|
jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
|
||||||
echo "EOF" >> "$GITHUB_OUTPUT"
|
echo "EOF" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
|
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
|
||||||
- name: "Upload artifacts"
|
- name: "Upload artifacts"
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
name: artifacts-build-global
|
||||||
path: |
|
path: |
|
||||||
${{ steps.cargo-dist.outputs.paths }}
|
${{ steps.cargo-dist.outputs.paths }}
|
||||||
${{ env.BUILD_MANIFEST_NAME }}
|
${{ env.BUILD_MANIFEST_NAME }}
|
||||||
|
@ -204,14 +209,15 @@ jobs:
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: Install cargo-dist
|
- name: Install cargo-dist
|
||||||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.8.2/cargo-dist-installer.sh | sh"
|
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.13.1/cargo-dist-installer.sh | sh"
|
||||||
# Fetch artifacts from scratch-storage
|
# Fetch artifacts from scratch-storage
|
||||||
- name: Fetch artifacts
|
- name: Fetch artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
pattern: artifacts-*
|
||||||
path: target/distrib/
|
path: target/distrib/
|
||||||
# This is a harmless no-op for Github Releases, hosting for that happens in "announce"
|
merge-multiple: true
|
||||||
|
# This is a harmless no-op for GitHub Releases, hosting for that happens in "announce"
|
||||||
- id: host
|
- id: host
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
@ -220,9 +226,10 @@ jobs:
|
||||||
cat dist-manifest.json
|
cat dist-manifest.json
|
||||||
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
|
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
|
||||||
- name: "Upload dist-manifest.json"
|
- name: "Upload dist-manifest.json"
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
# Overwrite the previous copy
|
||||||
|
name: artifacts-dist-manifest
|
||||||
path: dist-manifest.json
|
path: dist-manifest.json
|
||||||
|
|
||||||
publish-homebrew-formula:
|
publish-homebrew-formula:
|
||||||
|
@ -243,25 +250,29 @@ jobs:
|
||||||
token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
|
token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
|
||||||
# So we have access to the formula
|
# So we have access to the formula
|
||||||
- name: Fetch local artifacts
|
- name: Fetch local artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
pattern: artifacts-*
|
||||||
path: Formula/
|
path: Formula/
|
||||||
|
merge-multiple: true
|
||||||
|
# This is extra complex because you can make your Formula name not match your app name
|
||||||
|
# so we need to find releases with a *.rb file, and publish with that filename.
|
||||||
- name: Commit formula files
|
- name: Commit formula files
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name "${GITHUB_USER}"
|
git config --global user.name "${GITHUB_USER}"
|
||||||
git config --global user.email "${GITHUB_EMAIL}"
|
git config --global user.email "${GITHUB_EMAIL}"
|
||||||
|
|
||||||
for release in $(echo "$PLAN" | jq --compact-output '.releases[]'); do
|
for release in $(echo "$PLAN" | jq --compact-output '.releases[] | select([.artifacts[] | endswith(".rb")] | any)'); do
|
||||||
name=$(echo "$release" | jq .app_name --raw-output)
|
filename=$(echo "$release" | jq '.artifacts[] | select(endswith(".rb"))' --raw-output)
|
||||||
|
name=$(echo "$filename" | sed "s/\.rb$//")
|
||||||
version=$(echo "$release" | jq .app_version --raw-output)
|
version=$(echo "$release" | jq .app_version --raw-output)
|
||||||
|
|
||||||
git add Formula/${name}.rb
|
git add "Formula/${filename}"
|
||||||
git commit -m "${name} ${version}"
|
git commit -m "${name} ${version}"
|
||||||
done
|
done
|
||||||
git push
|
git push
|
||||||
|
|
||||||
# Create a Github Release while uploading all files to it
|
# Create a GitHub Release while uploading all files to it
|
||||||
announce:
|
announce:
|
||||||
needs:
|
needs:
|
||||||
- plan
|
- plan
|
||||||
|
@ -278,16 +289,17 @@ jobs:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
- name: "Download Github Artifacts"
|
- name: "Download GitHub Artifacts"
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: artifacts
|
pattern: artifacts-*
|
||||||
path: artifacts
|
path: artifacts
|
||||||
|
merge-multiple: true
|
||||||
- name: Cleanup
|
- name: Cleanup
|
||||||
run: |
|
run: |
|
||||||
# Remove the granular manifests
|
# Remove the granular manifests
|
||||||
rm -f artifacts/*-dist-manifest.json
|
rm -f artifacts/*-dist-manifest.json
|
||||||
- name: Create Github Release
|
- name: Create GitHub Release
|
||||||
uses: ncipollo/release-action@v1
|
uses: ncipollo/release-action@v1
|
||||||
with:
|
with:
|
||||||
tag: ${{ needs.plan.outputs.tag }}
|
tag: ${{ needs.plan.outputs.tag }}
|
||||||
|
|
|
@ -40,7 +40,7 @@ lto = "thin"
|
||||||
# Config for 'cargo dist'
|
# Config for 'cargo dist'
|
||||||
[workspace.metadata.dist]
|
[workspace.metadata.dist]
|
||||||
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
|
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
|
||||||
cargo-dist-version = "0.8.2"
|
cargo-dist-version = "0.13.1"
|
||||||
# CI backends to support
|
# CI backends to support
|
||||||
ci = ["github"]
|
ci = ["github"]
|
||||||
# The installers to generate for each app
|
# The installers to generate for each app
|
||||||
|
@ -48,10 +48,12 @@ installers = ["shell", "homebrew"]
|
||||||
# A GitHub repo to push Homebrew formulas to
|
# A GitHub repo to push Homebrew formulas to
|
||||||
tap = "msfjarvis/homebrew-tap"
|
tap = "msfjarvis/homebrew-tap"
|
||||||
# Target platforms to build apps for (Rust target-triple syntax)
|
# Target platforms to build apps for (Rust target-triple syntax)
|
||||||
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
|
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu"]
|
||||||
# Publish jobs to run in CI
|
# Publish jobs to run in CI
|
||||||
publish-jobs = ["homebrew"]
|
publish-jobs = ["homebrew"]
|
||||||
# Whether to consider the binaries in a package for distribution (defaults true)
|
# Whether to consider the binaries in a package for distribution (defaults true)
|
||||||
dist = true
|
dist = true
|
||||||
# Publish jobs to run in CI
|
# Publish jobs to run in CI
|
||||||
pr-run-mode = "upload"
|
pr-run-mode = "upload"
|
||||||
|
# Whether to install an updater program
|
||||||
|
install-updater = true
|
||||||
|
|
Loading…
Reference in New Issue