Merge pull request #836 from kachick/sync-node-version-with-asdf

Fix WebApp CI with dependency issues
pankona · Jun 20, 2023 · fc8f07e · fc8f07e
2 parents e56f219 + 966825b
commit fc8f07e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,6 +21,9 @@ updates:
   open-pull-requests-limit: 10
   labels:
   - automerge
+  ignore:
+    - dependency-name: '@types/node'
+      update-types: ['version-update:semver-major']
 - package-ecosystem: gomod
   directory: "/hashira-web/functions"
   schedule:

diff --git a/.github/workflows/hashira-web--test.yml b/.github/workflows/hashira-web--test.yml
@@ -25,9 +25,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
-          node-version: "14"
+          node-version-file: "hashira-web/.tool-versions"
           cache: "yarn"
           cache-dependency-path: "hashira-web/yarn.lock"
       - run: yarn install

diff --git a/hashira-web/.tool-versions b/hashira-web/.tool-versions
@@ -1,2 +1,2 @@
 yarn 1.22.15
-nodejs 16.11.0
+nodejs 16.20.0
diff --git a/hashira-web/package.json b/hashira-web/package.json
@@ -33,6 +33,7 @@
     "vite": "^4.2.0"
   },
   "dependencies": {
+    "@types/node": "^16.18.36",
     "firebase": "^9.22.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/hashira-web/yarn.lock b/hashira-web/yarn.lock
@@ -1174,6 +1174,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
   integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
 
+"@types/node@^16.18.36":
+  version "16.18.36"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.36.tgz#0db5d7efc4760d36d0d1d22c85d1a53accd5dc27"
+  integrity sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==
+
 "@types/prop-types@*":
   version "15.7.4"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"