Skip to content

Commit

Permalink
0.2.317
Browse files Browse the repository at this point in the history
  • Loading branch information
mistydemeo committed Dec 17, 2024
1 parent b34a9cf commit 8b9b46c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 22 deletions.
19 changes: 0 additions & 19 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,6 @@ jobs:
name: cargo-dist-cache
path: ~/.cargo/bin/
- run: chmod +x ~/.cargo/bin/dist
- name: Install cargo-cyclonedx
# we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` return non-0
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/CycloneDX/cyclonedx-rust-cargo/releases/download/cargo-cyclonedx-0.5.5/cargo-cyclonedx-installer.sh | sh"
shell: bash
- name: Install omnibor
# we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` return non-0
Expand All @@ -241,26 +236,12 @@ jobs:
echo "EOF" >> "$GITHUB_OUTPUT"
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
- id: cargo-cyclonedx
shell: bash
run: |
# Generate SBOM (.cdx.xml) files.
cargo cyclonedx -v
# Move all SBOM (.cdx.xml) files under target/distrib/ since
# we expect all artifacts to be in that folder.
find . -name '*.cdx.xml' -exec mv '{}' target/distrib/ ';'
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
find . -name '*.cdx.xml' | tee -a "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: "Upload artifacts"
uses: actions/upload-artifact@v4
with:
name: artifacts-build-global
path: |
${{ steps.cargo-dist.outputs.paths }}
${{ steps.cargo-cyclonedx.output.paths }}
${{ env.BUILD_MANIFEST_NAME }}
custom-global-build-greeter:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "axolotlsay"
description = "💬 a CLI for learning to distribute CLIs in rust"
version = "0.2.316"
version = "0.2.317"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/mistydemeo/cargodisttest.git"
Expand Down
2 changes: 1 addition & 1 deletion dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ macos-sign = true
# Whether to embed dependency information using cargo-auditable
cargo-auditable = false
# Whether to use cargo-cyclonedx to generate an SBOM
cargo-cyclonedx = true
cargo-cyclonedx = false
# Whether to use omnibor-cli to generate OmniBOR Artifact IDs
omnibor = true

Expand Down

0 comments on commit 8b9b46c

Please sign in to comment.