Skip to content

Commit af937ac

Browse files
authored
Merge pull request #261 from AppThreat/chore-cdxgen-namespace
Switch to the new @cdxgen/cdxgen package namespace
2 parents d3b3851 + bf1c8ea commit af937ac

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
env:
121121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122122
- run: |
123-
npm install -g @cyclonedx/cdxgen --omit=optional
123+
npm install -g @cdxgen/cdxgen --omit=optional
124124
cdxgen -t python --deep -o $GITHUB_WORKSPACE/repotests/DjanGoat/bom.json $GITHUB_WORKSPACE/repotests/DjanGoat
125125
# Reachables runs the Flux engine by default, which builds method flow summaries and uses
126126
# them for summary-guided pruning (cached next to the atom). `--legacy-dataflow` opts out.
@@ -139,7 +139,7 @@ jobs:
139139
shell: bash
140140
- name: Generate SBOM with cdxgen
141141
run: |
142-
npm install -g @cyclonedx/cdxgen
142+
npm install -g @cdxgen/cdxgen
143143
cdxgen -t sbt -o bom.json . -p --no-recurse
144144
env:
145145
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
GITHUB_USERNAME: ${{ github.actor }}
171171
- name: Generate SBOM with cdxgen
172172
run: |
173-
npm install -g @cyclonedx/cdxgen
173+
npm install -g @cdxgen/cdxgen
174174
cdxgen -t sbt -o bom.json . -p --no-recurse
175175
env:
176176
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/repotests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
210210
JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"
211211
- run: |
212-
npm install -g @cyclonedx/cdxgen --omit=optional
212+
npm install -g @cdxgen/cdxgen --omit=optional
213213
cdxgen -t java --deep -o $GITHUB_WORKSPACE/repotests/bouncycastle-examples/bom.json $GITHUB_WORKSPACE/repotests/bouncycastle-examples
214214
./atom.sh reachables --include-crypto --remove-atom -o /tmp/bouncycastle-examples.atom -l java $GITHUB_WORKSPACE/repotests/bouncycastle-examples -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/bouncycastle-examples.reachables.json
215215
cdxgen -t java --deep -o $GITHUB_WORKSPACE/repotests/java-sec-code/bom.json $GITHUB_WORKSPACE/repotests/java-sec-code

0 commit comments

Comments
 (0)