Skip to content

Commit

Permalink
Fix meta usage in release-asset generation
Browse files Browse the repository at this point in the history
Signed-off-by: Henri Rosten <henri.rosten@unikie.com>
  • Loading branch information
henrirosten committed Dec 21, 2023
1 parent 257dad2 commit e95ba0d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/release_sbomnix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
- uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Make sure nix-build works
run: nix-build '<nixpkgs>' -A hello
- name: Build release asset
run: nix develop --command make release-asset
- name: Upload release asset
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,12 @@ format: clean ## Reformat with black
$(call target_success,$@)

release-asset: clean ## Build release asset
nix-shell -p nix-info --run "nix-info -m"
nix-env -qa --meta --json -f $(shell nix-shell -p nix-info --run "nix-info -m" | grep "nixpkgs: " | cut -d'`' -f2) '.*' >meta.json
mkdir -p build/
nix run .#sbomnix -- result \
--meta=./meta.json \
nix run .#sbomnix -- . \
--cdx=./build/sbom.runtime.cdx.json \
--spdx=./build/sbom.runtime.spdx.json \
--csv=./build/sbom.runtime.csv
nix run .#sbomnix -- result --buildtime \
--meta=./meta.json \
nix run .#sbomnix -- --buildtime . \
--cdx=./build/sbom.buildtime.cdx.json \
--spdx=./build/sbom.buildtime.spdx.json \
--csv=./build/sbom.buildtime.csv
Expand Down

0 comments on commit e95ba0d

Please sign in to comment.