Skip to content

Commit 403b755

Browse files
authored
Upgrade: [AEA-4506] - Use main branch for SBOM action (#4)
## Summary - Routine Change ### Details Move to use the main branch version of the SBOM action, so it's always up to date
1 parent f8649dd commit 403b755

File tree

2 files changed

+5
-66
lines changed

2 files changed

+5
-66
lines changed

.github/workflows/quality-checks.yml

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ on:
55
secrets:
66
SONAR_TOKEN:
77
required: true
8-
inputs:
9-
node_version:
10-
description: The version of node used in this project.
11-
required: true
12-
type: string
138

149
jobs:
1510
quality_checks:
@@ -259,63 +254,11 @@ jobs:
259254
name: cfn_guard_output
260255
path: cfn_guard_output
261256

257+
- name: Generate and check SBOMs
258+
uses: NHSDigital/eps-action-sbom@main
259+
262260
- name: SonarCloud Scan
263261
uses: SonarSource/sonarcloud-github-action@master
264262
env:
265263
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
266264
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
267-
268-
sbom_checks:
269-
runs-on: ubuntu-latest
270-
steps:
271-
- name: Checkout code
272-
uses: actions/checkout@v4
273-
with:
274-
ref: ${{ env.BRANCH_NAME }}
275-
fetch-depth: 0
276-
277-
# using git commit sha for version of action to ensure we have stable version
278-
- name: Install asdf
279-
uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
280-
with:
281-
asdf_branch: v0.14.1
282-
283-
- name: Cache asdf
284-
uses: actions/cache@v4
285-
with:
286-
path: |
287-
~/.asdf
288-
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
289-
restore-keys: |
290-
${{ runner.os }}-asdf-
291-
292-
- name: Install asdf dependencies in .tool-versions
293-
uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
294-
with:
295-
asdf_branch: v0.14.1
296-
env:
297-
PYTHON_CONFIGURE_OPTS: --enable-shared
298-
299-
- name: Setting up .npmrc
300-
env:
301-
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
302-
run: |
303-
echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
304-
echo "@nhsdigital:registry=https://npm.pkg.github.com" >> ~/.npmrc
305-
306-
- name: make install
307-
run: |
308-
make install
309-
310-
- name: Generate and check SBOMs
311-
uses: NHSDigital/[email protected]
312-
with:
313-
node_version: ${{ inputs.node_version }}
314-
315-
- name: Upload SBOMs
316-
uses: actions/upload-artifact@v4
317-
if: success() || failure()
318-
with:
319-
name: SBOMS
320-
path: '**/*sbom*.json'
321-

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ A workflow to run the quality checks for EPS repositories. The steps executed by
1414
# Usage
1515

1616
## Inputs
17-
### `node_version`
18-
19-
One of `[18, 20, 22]`. SBOM generations requires knowing which version of nodeJS is being used.
2017

18+
None
2119

2220
## Required Makefile targets
2321

@@ -50,9 +48,7 @@ on:
5048

5149
jobs:
5250
quality_checks:
53-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v1
54-
with:
55-
node_version: '20'
51+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@main
5652
secrets:
5753
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5854
```

0 commit comments

Comments
 (0)