Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/dashboard/sentry/…
Browse files Browse the repository at this point in the history
…tracing-7.86.0
  • Loading branch information
jakepage91 authored Dec 19, 2023
2 parents dc9b138 + 9cc6892 commit 63b38b9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_test_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
cache-dependency-path: "dashboard/package-lock.json"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hacktoberfest-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Comment on PR
if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'hacktoberfest-accepted') }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
build_frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: "npm"
cache-dependency-path: "dashboard/package-lock.json"

Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
needs: build_frontend
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
PURPLIN_BOT: ${{ secrets.PURPLIN_BOT }}
DISCORD_FEEDBACK_URL: ${{ secrets.DISCORD_FEEDBACK_URL }}

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: tailwarden/helm
ref: master
Expand Down
8 changes: 4 additions & 4 deletions dashboard/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 dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@types/node": "20.9.0",
"@types/react": "18.2.22",
"@types/react-cytoscapejs": "^1.2.5",
"@types/react-dom": "18.2.12",
"@types/react-dom": "18.2.18",
"@types/react-simple-maps": "^3.0.2",
"autoprefixer": "^10.4.16",
"eslint": "^8.49.0",
Expand Down

0 comments on commit 63b38b9

Please sign in to comment.