From e95ba0d7186c2249c2fd39f05624b02d588ebdcd Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Wed, 20 Dec 2023 16:52:22 +0200 Subject: [PATCH] Fix meta usage in release-asset generation Signed-off-by: Henri Rosten --- .github/workflows/release_sbomnix.yml | 2 -- Makefile | 8 ++------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release_sbomnix.yml b/.github/workflows/release_sbomnix.yml index 8eb23ea..b0460fb 100644 --- a/.github/workflows/release_sbomnix.yml +++ b/.github/workflows/release_sbomnix.yml @@ -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 '' -A hello - name: Build release asset run: nix develop --command make release-asset - name: Upload release asset diff --git a/Makefile b/Makefile index 75e0991..113d616 100644 --- a/Makefile +++ b/Makefile @@ -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