From 4726e430f26bfe9158733fb7875191f6c5278def Mon Sep 17 00:00:00 2001 From: manifestori Date: Mon, 30 Oct 2023 10:51:15 +0100 Subject: [PATCH 1/6] ci: test orb From 7c3959573ce13759731a04dfce5d0f21e2670905 Mon Sep 17 00:00:00 2001 From: manifestori Date: Mon, 30 Oct 2023 10:56:46 +0100 Subject: [PATCH 2/6] ci: fix orb --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 729a1e9..9206340 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - checkout - sbom-transmitter/install-syft - sbom-transmitter/run-syft: - purl: ./ + source: ./ file: python-example-sbom.json - sbom-transmitter/transmit: sbom-file-path: python-example-sbom.json @@ -28,7 +28,7 @@ jobs: command: sudo npm install -g @cyclonedx/cdxgen name: Install dependencies - run: - command: cdxgen . -o ./bom.json --deep --type python --resolve-class --recurse + command: cdxgen . -o ./bom.json --deep --type python --resolve-class --recurse --spec-version 1.4 name: Create SBOM - run: command: cat ./bom.json From 83322c75c1b07334934c2011e9f8174e667cbac6 Mon Sep 17 00:00:00 2001 From: manifestori Date: Mon, 30 Oct 2023 11:18:30 +0100 Subject: [PATCH 3/6] ci: test orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9206340..9602de5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: steps: - checkout - run: - command: sudo npm install -g @cyclonedx/cdxgen + command: npm install -g @cyclonedx/cdxgen name: Install dependencies - run: command: cdxgen . -o ./bom.json --deep --type python --resolve-class --recurse --spec-version 1.4 From af82b2305b93c40f2e1e7664dc6b5d653dabb089 Mon Sep 17 00:00:00 2001 From: manifestori Date: Mon, 30 Oct 2023 11:28:48 +0100 Subject: [PATCH 4/6] ci: test orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9602de5..9206340 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,7 +25,7 @@ jobs: steps: - checkout - run: - command: npm install -g @cyclonedx/cdxgen + command: sudo npm install -g @cyclonedx/cdxgen name: Install dependencies - run: command: cdxgen . -o ./bom.json --deep --type python --resolve-class --recurse --spec-version 1.4 From 8d71b75904da8da859a7b5df962c7e2461845525 Mon Sep 17 00:00:00 2001 From: manifestori Date: Mon, 30 Oct 2023 11:31:51 +0100 Subject: [PATCH 5/6] ci: test orb From 7eedf1ed4681fba446987cb7a7df505c19df53e5 Mon Sep 17 00:00:00 2001 From: manifestori Date: Wed, 1 Nov 2023 14:33:54 +0100 Subject: [PATCH 6/6] ci: new ci --- .circleci/config.yml | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9206340..e2b1a3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - sbom-transmitter: manifest/sbom-transmitter@0.2.6 + sbom: manifest/sbom@0.0.3 node: circleci/node@5.1.0 filters: &filters @@ -8,38 +8,35 @@ filters: &filters only: /.*/ jobs: - sbom: + sbom-syft: docker: - image: cimg/base:current steps: - checkout - - sbom-transmitter/install-syft - - sbom-transmitter/run-syft: - source: ./ - file: python-example-sbom.json - - sbom-transmitter/transmit: - sbom-file-path: python-example-sbom.json - + - sbom/install: + version: v0.10.0 + - sbom/generate: + format: spdx-json + source: . sbom-cdxgen: executor: node/default steps: - checkout - - run: - command: sudo npm install -g @cyclonedx/cdxgen - name: Install dependencies - - run: - command: cdxgen . -o ./bom.json --deep --type python --resolve-class --recurse --spec-version 1.4 - name: Create SBOM - - run: - command: cat ./bom.json - name: View SBOM - - sbom-transmitter/transmit: - sbom-file-path: ./bom.json - + - sbom/install: + generator: cdxgen + version: v0.10.0 + - sbom/generate: + args: "--spec-version 1.4" + format: cyclonedx-json + generator: cdxgen + output: bom.json + source: . + source_name: node + source_version: 14.17.0 workflows: sbom: jobs: - - sbom: + - sbom-syft: filters: *filters - sbom-cdxgen: filters: *filters