Skip to content

Commit d8476f3

Browse files
authored
Merge branch 'main' into feat/add-demo-stack-deletion
2 parents c9aec77 + 3bb809c commit d8476f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+8341
-6283
lines changed

.github/workflows/pr_cockpit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ on:
1515
- "go.sum"
1616

1717
env:
18-
RUST_VERSION: 1.87.0
19-
GO_VERSION: '^1.22.5'
18+
RUST_VERSION: 1.93.0
19+
GO_VERSION: '^1.26.0'
2020
CARGO_TERM_COLOR: always
2121
CARGO_INCREMENTAL: "0"
2222
CARGO_PROFILE_DEV_DEBUG: "0"

.github/workflows/pr_general.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: Pull Request General
44
on: workflow_call
55

66
env:
7-
RUST_VERSION: 1.87.0
8-
GO_VERSION: '^1.22.5'
7+
RUST_VERSION: 1.93.0
8+
GO_VERSION: '^1.26.0'
99
CARGO_TERM_COLOR: always
1010
CARGO_INCREMENTAL: "0"
1111
CARGO_PROFILE_DEV_DEBUG: "0"
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
6060
with:
6161
submodules: recursive
62-
- uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
62+
- uses: EmbarkStudios/cargo-deny-action@3fd3802e88374d3fe9159b834c7714ec57d6c979 # v2.0.15
6363
with:
6464
command: check ${{ matrix.checks }}
6565

.github/workflows/pr_stackablectl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414
- "extra/**"
1515

1616
env:
17-
RUST_VERSION: 1.87.0
18-
GO_VERSION: '^1.22.5'
17+
RUST_VERSION: 1.93.0
18+
GO_VERSION: '^1.26.0'
1919
CARGO_TERM_COLOR: always
2020
CARGO_INCREMENTAL: "0"
2121
CARGO_PROFILE_DEV_DEBUG: "0"

.github/workflows/release_stackablectl.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
- "stackablectl-[0-9]+.[0-9]+.[0-9]+**"
88

99
env:
10-
RUST_VERSION: 1.87.0
10+
CARGO_CYCLONEDX_VERSION: 0.5.7
11+
RUST_VERSION: 1.93.0
1112
CARGO_TERM_COLOR: always
1213
CARGO_INCREMENTAL: "0"
1314
CARGO_PROFILE_DEV_DEBUG: "0"
@@ -50,14 +51,25 @@ jobs:
5051
with:
5152
go-version: '^1.22.2'
5253

54+
- name: Install cargo-cyclonedx
55+
run: cargo install --locked cargo-cyclonedx@${{ env.CARGO_CYCLONEDX_VERSION }}
56+
5357
- name: Build Binary
5458
if: matrix.os != 'windows-latest'
5559
run: cargo build --target ${{ matrix.target }} --release --package stackablectl
5660

61+
- name: Generate SBOM
62+
run: cargo cyclonedx --all --spec-version 1.5 --describe binaries
63+
5764
- name: Rename Binary
5865
run: mv target/${{ matrix.target }}/release/stackablectl${{ matrix.file-suffix }} stackablectl-${{ matrix.target }}${{ matrix.file-suffix }}
5966

60-
- name: Upload Release Binary
67+
- name: Rename SBOM
68+
run: mv rust/stackablectl/stackablectl_bin.cdx.xml stackablectl-${{ matrix.target }}.cdx.xml
69+
70+
- name: Upload Release Binary and SBOM
6171
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
6272
with:
63-
files: stackablectl-${{ matrix.target }}${{ matrix.file-suffix }}
73+
files: |
74+
stackablectl-${{ matrix.target }}${{ matrix.file-suffix }}
75+
stackablectl-${{ matrix.target }}.cdx.xml

0 commit comments

Comments
 (0)