Merge 7d25003 into 4254cca

ProbedJS · Apr 21, 2021 · 49cdde1 · 49cdde1
2 parents 4254cca + 7d25003
commit 49cdde1
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ on:
     - '.github/workflows/**'
 
 jobs:
-  build:
+  checks:
     runs-on: ubuntu-latest
 
     steps:
@@ -51,14 +51,48 @@ jobs:
 
     - name: License check
       run: pnpm run licenseCheck 
-  
+
     # Source Tests 
     - name: Unit tests
       env:
         TEST: FULL
         COVERAGE: 1
       run: pnpm run test:full
 
+    # Save results    
+    - name: Coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js 15.x
+      uses: actions/setup-node@v2
+      with:
+        node-version: 15.x
+
+    - name: Cache pnpm modules
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-pnpm-modules
+      with:
+        path: ~/.pnpm-store
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-15.x-${{ hashFiles('**/package.json') }}
+        restore-keys: |
+          ${{ runner.os }}-build-${{ env.cache-name }}-15.x-
+    
+    - name: Setup PNPM
+      uses: pnpm/action-setup@v2.0.0
+      with:
+        version: 6.0.2
+        run_install: |
+          - args: [--frozen-lockfile, --strict-peer-dependencies]
+  
     # Build
     - name: Build
       run: pnpm run build
@@ -67,12 +101,6 @@ jobs:
     - name: Post-build repo check
       run: git diff --exit-code
 
-    # Save results    
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Archive Build
       uses: actions/upload-artifact@v2
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,19 +5,22 @@ on:
     types: [published]
 
 jobs:
-  build:
+  checks:
     runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
 
-    - name: Make sure versions match
-      run: "[[ \"v$(jq -r .version package.json)\" == \"${{ github.event.release.tag_name }}\" ]]"
+    steps:
+    - name: Cancel Previous Runs
+      uses: styfle/cancel-workflow-action@0.9.0
+      with:
+        access_token: ${{ github.token }}
 
+    - uses: actions/checkout@v2
+
     - name: Use Node.js 15.x
       uses: actions/setup-node@v2
       with:
         node-version: 15.x
-
+    
     - name: Cache pnpm modules
       uses: actions/cache@v2
       env:
@@ -34,24 +37,56 @@ jobs:
         version: 6.0.2
         run_install: |
           - args: [--frozen-lockfile, --strict-peer-dependencies]
-    
+
     # Checks 
     - name: Lint
       run: pnpm run lint
 
     - name: License check
       run: pnpm run licenseCheck 
-  
+
     # Source Tests 
-    - name: Source tests
+    - name: Unit tests
       env:
         TEST: FULL
       run: pnpm run test:full
 
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js 15.x
+      uses: actions/setup-node@v2
+      with:
+        node-version: 15.x
+
+    - name: Cache pnpm modules
+      uses: actions/cache@v2
+      env:
+        cache-name: cache-pnpm-modules
+      with:
+        path: ~/.pnpm-store
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-15.x-${{ hashFiles('**/package.json') }}
+        restore-keys: |
+          ${{ runner.os }}-build-${{ env.cache-name }}-15.x-
+    
+    - name: Setup PNPM
+      uses: pnpm/action-setup@v2.0.0
+      with:
+        version: 6.0.2
+        run_install: |
+          - args: [--frozen-lockfile, --strict-peer-dependencies]
+  
     # Build
     - name: Build
       run: pnpm run build
 
+    # Sanity Checks
+    - name: Post-build repo check
+      run: git diff --exit-code
+
     - name: Archive Build
       uses: actions/upload-artifact@v2
       with:

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@probed/core",
     "description": "A single-pass JSX-friendly dynamic tree backend.",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "type": "module",
     "main": "dist/cjs/probe-core.js",
     "module": "dist/esm/probe-core.js",