Skip to content

Commit e30122d

Browse files
authored
Merge branch 'main' into defi-controller-changes
2 parents a3456b1 + b8a3c58 commit e30122d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
run: ${{ steps.download-actionlint.outputs.executable }} -color
2525
shell: bash
2626

27-
analyse-code:
28-
name: Code scanner
29-
needs: check-workflows
30-
uses: ./.github/workflows/security-code-scanner.yml
31-
permissions:
32-
actions: read
33-
contents: read
34-
security-events: write
35-
secrets:
36-
SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
37-
APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
27+
# analyse-code:
28+
# name: Code scanner
29+
# needs: check-workflows
30+
# uses: ./.github/workflows/security-code-scanner.yml
31+
# permissions:
32+
# actions: read
33+
# contents: read
34+
# security-events: write
35+
# secrets:
36+
# SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
37+
# APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
3838

3939
lint-build-test:
4040
name: Lint, build, and test
@@ -77,7 +77,7 @@ jobs:
7777
name: All jobs complete
7878
runs-on: ubuntu-latest
7979
needs:
80-
- analyse-code
80+
# - analyse-code
8181
- lint-build-test
8282
outputs:
8383
passed: ${{ steps.set-output.outputs.passed }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/*
1+
v24.7.0

0 commit comments

Comments
 (0)