From eb0fd6d57c3487852ae5285e2a79e35d726741f1 Mon Sep 17 00:00:00 2001
From: arzola <oscararzola@gmail.com>
Date: Tue, 24 Jan 2023 05:10:52 -0500
Subject: [PATCH] change: consolidate ci npm and upgrade node
---
.github/workflows/build-and-lint.yml | 25 +------------------------
.nvmrc | 1 +
package-lock.json | 2 +-
package.json | 2 +-
4 files changed, 4 insertions(+), 26 deletions(-)
create mode 100644 .nvmrc
diff --git a/.github/workflows/build-and-lint.yml b/.github/workflows/build-and-lint.yml
index c140c30..97721ea 100644
--- a/.github/workflows/build-and-lint.yml
+++ b/.github/workflows/build-and-lint.yml
@@ -8,27 +8,4 @@ on:
branches: [ dev ]
jobs:
build:
- runs-on: ubuntu-latest
- strategy:
- matrix:
- node: [ '14', '16' ]
- name: Node ${{ matrix.node }}
-
- steps:
- - uses: actions/checkout@v3
- - name: Setup node
- uses: actions/setup-node@v3
- with:
- node-version: ${{ matrix.node }}
- - name: Cache Node modules
- uses: actions/cache@v3
- with:
- path: node_modules
- key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}
- - name: Install Node dependencies & build assets
- run: |
- node -v
- npm install
- npm run build
- - name: Run ESLint and Stylelint
- run: npm run lint
+ uses: pressbooks/composer-autoupdate-bedrock/.github/workflows/lint-build.yml@v1
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000..3f430af
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+v18
diff --git a/package-lock.json b/package-lock.json
index fb365f0..001e6cc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
"pressbooks-build-tools": "^4.0.0"
},
"engines": {
- "node": ">= 14"
+ "node": ">= 18"
}
},
"node_modules/@allmarkedup/fang": {
diff --git a/package.json b/package.json
index 3f120c8..fd08830 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
"test": "npm run lint"
},
"engines": {
- "node": ">= 14"
+ "node": ">= 18"
},
"devDependencies": {
"npm-run-all": "^4.1.5",