Skip to content

Commit

Permalink
Fix Node.js stuff in GitHub action workflows (#1240)
Browse files Browse the repository at this point in the history
* Remove unused main2 merge workflow

* Pin Node version in GitHub workflows to 16, fixup caching

* Bring Node 16 @types/node up to date

* Work around a dumb bug

actions/setup-node#317
  • Loading branch information
mqp committed Nov 24, 2022
1 parent ebaa76c commit 3a0ea53
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 38 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Restore cached node_modules
uses: actions/cache@v2
- name: Install Node 16
uses: actions/setup-node@v3
env:
FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
- name: Install missing dependencies
node-version: 16
cache: 'yarn'
- name: Install dependencies
run: yarn install --prefer-offline --frozen-lockfile
- name: Run Prettier on web client
working-directory: web
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ jobs:
uses: actions/checkout@v3
with:
token: ${{ secrets.FORMATTER_ACCESS_TOKEN }}
- name: Restore cached node_modules
uses: actions/cache@v2
- name: Install Node 16
uses: actions/setup-node@v3
env:
FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
- name: Install missing dependencies
node-version: 16
cache: 'yarn'
- name: Install dependencies
run: yarn install --prefer-offline --frozen-lockfile
- name: Run Prettier on web client
working-directory: web
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ jobs:
uses: actions/checkout@v3
with:
token: ${{ secrets.FORMATTER_ACCESS_TOKEN }}
- name: Restore cached node_modules
uses: actions/cache@v2
- name: Install Node 16
uses: actions/setup-node@v3
env:
FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
- name: Install missing dependencies
node-version: 16
cache: 'yarn'
- name: Install dependencies
run: yarn install --prefer-offline --frozen-lockfile
- name: Run lint script
run: yarn lint
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/merge-main-into-main2.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"dependencies": {},
"devDependencies": {
"@types/node": "16.11.11",
"@types/node": "16.18.3",
"@typescript-eslint/eslint-plugin": "5.36.0",
"@typescript-eslint/parser": "5.36.0",
"concurrently": "6.5.1",
Expand Down
1 change: 0 additions & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@
"@tailwindcss/typography": "^0.5.1",
"@types/d3": "7.4.0",
"@types/lodash": "4.14.178",
"@types/node": "16.11.11",
"@types/react": "18.0.21",
"@types/react-dom": "18.0.6",
"@types/string-similarity": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3610,10 +3610,10 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==

"@types/node@16.11.11":
version "16.11.11"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
"@types/node@16.18.3":
version "16.18.3"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc"
integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==

"@types/node@^17.0.5":
version "17.0.38"
Expand Down

3 comments on commit 3a0ea53

@vercel
Copy link

@vercel vercel bot commented on 3a0ea53 Nov 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

dev – ./web

dev-mantic.vercel.app
dev-git-main-mantic.vercel.app
dev-manifold.vercel.app
dev.manifold.markets

@vercel
Copy link

@vercel vercel bot commented on 3a0ea53 Nov 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs – ./docs

docs.manifold.markets
docs-git-main-mantic.vercel.app
docs-mantic.vercel.app
docs-pi-teal.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 3a0ea53 Nov 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.