Update workflows and configure renovate

sjinks · Dec 2, 2021 · 05d4080 · 05d4080
1 parent dc4152f
commit 05d4080
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 50 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>sjinks/.github:renovate-config"
+  ]
+}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,17 +25,10 @@ jobs:
         uses: actions/[email protected]
         with:
           node-version: ${{ matrix.node }}
+          cache: npm
 
-      - name: Cache Node modules
-        uses: actions/[email protected]
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node }}-
-            ${{ runner.os }}-build-${{ env.cache-name }}-
+      - name: Update npm
+        run: npm i -g npm
 
       - name: Install dependencies
         run: npm ci --ignore-scripts

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -11,9 +11,6 @@ on:
         description: Publish to NPM?
         required: true
 
-env:
-  NODE_VERSION: 14
-
 jobs:
   prepare:
     name: Prepare the source code
@@ -28,18 +25,8 @@ jobs:
       - name: Set up Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      - name: Cache Node modules
-        uses: actions/[email protected]
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.NODE_VERSION }}-
-            ${{ runner.os }}-build-${{ env.cache-name }}-
+          node-version: lts/*
+          cache: npm
 
       - name: Install dependencies
         run: npm ci --ignore-scripts

diff --git a/.github/workflows/push-tag.yml b/.github/workflows/push-tag.yml
@@ -5,9 +5,6 @@ on:
     tags:
       - "*"
 
-env:
-  NODE_VERSION: 14
-
 jobs:
   build:
     name: Build
@@ -19,18 +16,11 @@ jobs:
       - name: Set up Node.js environment
         uses: actions/[email protected]
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: lts/*
+          cache: npm
 
-      - name: Cache Node modules
-        uses: actions/[email protected]
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.NODE_VERSION }}-
-            ${{ runner.os }}-build-${{ env.cache-name }}-
+      - name: Update npm
+        run: npm i -g npm
 
       - name: Install dependencies
         run: npm ci --ignore-scripts