chore: Cleanup workflows

manferlo81 · Nov 13, 2024 · 252c00f · 252c00f
1 parent 8f0de16
commit 252c00f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,9 +13,6 @@ on:
 
   workflow_dispatch:
 
-env:
-  DEFAULT_NODE_VERSION: 20
-
 jobs:
   job_lint_and_test:
     name: Lint, Test and Build
@@ -29,15 +26,17 @@ jobs:
     needs: job_lint_and_test
 
     steps:
-      - name: Checkout, Setup Node.js v${{ env.DEFAULT_NODE_VERSION }} and Install dependencies
+      - name: Checkout, Setup Node.js v${{ env.NODE_VERSION }} and Install dependencies
         uses: manferlo81/action-checkout-node-install@v0
         with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
+        env:
+          NODE_VERSION: 20.x
 
       - name: Run tests
         run: npm test
         env:
-          CI: true
+          COVERAGE: CI
 
       - name: Upload coverage
         uses: codecov/codecov-action@v4
@@ -56,10 +55,12 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout, Setup Node.js v${{ env.DEFAULT_NODE_VERSION }} and Install dependencies
+      - name: Checkout, Setup Node.js v${{ env.NODE_VERSION }} and Install dependencies
         uses: manferlo81/action-checkout-node-install@v0
         with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
+        env:
+          NODE_VERSION: 20.x
 
       - name: Build
         run: npm run build
@@ -80,11 +81,13 @@ jobs:
     needs: job_lint_and_test
 
     steps:
-      - name: Checkout, Setup Node.js v${{ env.DEFAULT_NODE_VERSION }} and Install dependencies
+      - name: Checkout, Setup Node.js v${{ env.NODE_VERSION }} and Install dependencies
         uses: manferlo81/action-checkout-node-install@v0
         with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: https://registry.npmjs.org/
+        env:
+          NODE_VERSION: 20.x
 
       - name: Build
         run: npm run build

diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
@@ -3,8 +3,7 @@ name: Lint, Test and Build
 on:
   workflow_call:
 
-env:
-  DEFAULT_NODE_VERSION: 20
+
 
 jobs:
   job_lint:
@@ -13,10 +12,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout, Setup Node.js v${{ env.DEFAULT_NODE_VERSION }} and Install dependencies
+      - name: Checkout, Setup Node.js v${{ env.NODE_VERSION }} and Install dependencies
         uses: manferlo81/action-checkout-node-install@v0
         with:
-          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+          node-version: ${{ env.NODE_VERSION }}
+        env:
+          NODE_VERSION: 20.x
 
       - name: Lint code
         run: npm run lint
@@ -29,13 +30,13 @@ jobs:
             machine: windows-latest
           - name: Ubuntu
             machine: ubuntu-latest
-          - name: MacOS
+          - name: macOS
             machine: macos-latest
         node-version:
-          - 18
-          - 20
-          - 21
-          - 22
+          - 18.x
+          - 20.x
+          - 21.x
+          - 22.x
 
     name: Test and Build (${{ matrix.os.name }}, NodeJS v${{ matrix.node-version }})
 
@@ -51,7 +52,7 @@ jobs:
       - name: Run tests
         run: npm test
         env:
-          SKIP_COVERAGE: true
+          COVERAGE: SKIP
 
       - name: Build
         run: npm run build
diff --git a/jest.config.mjs b/jest.config.mjs
@@ -1,14 +1,16 @@
+const { COVERAGE } = process.env;
+
 /** @type { import("jest").Config } */
 const config = {
   cacheDirectory: 'node_modules/.cache/jest',
   preset: 'ts-jest',
 
-  collectCoverage: !process.env.SKIP_COVERAGE,
+  collectCoverage: COVERAGE !== 'SKIP',
   collectCoverageFrom: [
     'src/**/*.ts',
   ],
   coverageDirectory: 'coverage',
-  coverageReporters: process.env.CI
+  coverageReporters: COVERAGE === 'CI'
     ? ['json', 'clover', 'cobertura']
     : ['html', 'text'],