Skip to content

Commit

Permalink
Merge pull request #171 from radixdlt/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
dawidsowardx authored Jan 2, 2024
2 parents 0709ce3 + 36cf414 commit ac34e3e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 23 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
contents: read
deployments: write
steps:
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
- uses: RDXWorks-actions/checkout@main
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
with:
role_name: ${{ secrets.AWS_ROLE_NAME_SNYK_SECRET }}
Expand All @@ -42,7 +42,7 @@ jobs:
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
parse_json: true
- name: Run Snyk to check for deps vulnerabilities
uses: snyk/actions/node@b98d498629f1c368650224d6d212bf7dfa89e4bf # v0.4.0
uses: RDXWorks-actions/snyk-actions/node@master
with:
args: --all-projects --org=${{ env.SNYK_PROJECTS_ORG_ID }} --severity-threshold=critical

Expand All @@ -54,7 +54,7 @@ jobs:
contents: read
deployments: write
steps:
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
- uses: RDXWorks-actions/checkout@main
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
with:
role_name: ${{ secrets.AWS_ROLE_NAME_SNYK_SECRET }}
Expand All @@ -64,7 +64,7 @@ jobs:
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
parse_json: true
- name: Run Snyk to check for code vulnerabilities
uses: snyk/actions/node@b98d498629f1c368650224d6d212bf7dfa89e4bf # v0.4.0
uses: RDXWorks-actions/snyk-actions/node@master
with:
args: --all-projects --org=${{ env.SNYK_PROJECTS_ORG_ID }} --severity-threshold=high
command: code test
Expand All @@ -80,7 +80,7 @@ jobs:
- snyk-scan-deps-licences
- snyk-scan-code
steps:
- uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
- uses: RDXWorks-actions/checkout@main
- uses: radixdlt/public-iac-resuable-artifacts/fetch-secrets@main
with:
role_name: ${{ secrets.AWS_ROLE_NAME_SNYK_SECRET }}
Expand All @@ -90,7 +90,7 @@ jobs:
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
parse_json: true
- name: Generate SBOM # check SBOM can be generated but nothing is done with it
uses: snyk/actions/node@b98d498629f1c368650224d6d212bf7dfa89e4bf # v0.4.0
uses: RDXWorks-actions/snyk-actions/node@master
with:
args: --all-projects --org=${{ env.SNYK_PROJECTS_ORG_ID }} --format=cyclonedx1.4+json --json-file-output sbom.json
command: sbom
Expand All @@ -101,10 +101,10 @@ jobs:
- snyk-scan-deps-licences
- snyk-scan-code
steps:
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
- uses: RDXWorks-actions/checkout@main

- name: Use Node.js
uses: actions/setup-node@7c29869aec4da703a571b27bcd84d4f15af0b56e
uses: RDXWorks-actions/setup-node@main
with:
node-version: '18.x'

Expand All @@ -121,4 +121,4 @@ jobs:
run: npm run build

- name: Dump context
uses: crazy-max/ghaction-dump-context@v2
uses: RDXWorks-actions/ghaction-dump-context@master
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
permissions: write-all
steps:
- name: Checkout
uses: actions/checkout@v2
uses: RDXWorks-actions/checkout@main
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v2
uses: RDXWorks-actions/setup-node@main
with:
node-version: '18.x'
- name: Authenticate with private NPM package
Expand All @@ -44,12 +44,12 @@ jobs:
secret_name: ${{ secrets.AWS_SECRET_NAME_SNYK }}
parse_json: true
- name: Generate SBOM
uses: snyk/actions/node@b98d498629f1c368650224d6d212bf7dfa89e4bf # v0.4.0
uses: RDXWorks-actions/snyk-actions/node@master
with:
args: --all-projects --org=${{ env.SNYK_PROJECTS_ORG_ID }} --format=cyclonedx1.4+json --json-file-output sbom.json
command: sbom
- name: Upload SBOM
uses: AButler/upload-release-assets@c94805dc72e4b20745f543da0f62eaee7722df7a # v2.0.2
uses: RDXWorks-actions/upload-release-assets@c94805dc72e4b20745f543da0f62eaee7722df7a
with:
files: sbom.json
repo-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
19 changes: 10 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
"dependencies": {
"@radixdlt/babylon-gateway-api-sdk": "^1.2.0",
"@radixdlt/connect-button": "^1.0.1",
"@radixdlt/connect-button": "^1.0.3",
"@radixdlt/wallet-sdk": "1.0.1",
"immer": "^10.0.2",
"lodash.isequal": "^4.5.0",
Expand Down

0 comments on commit ac34e3e

Please sign in to comment.