Merge master into v11

.github/workflows/benchmarks.yml

@@ -19,268 +19,95 @@ on:
       - 'mangle.json'
 
 jobs:
+  build_test:
+    name: Build & Test
+    uses: ./.github/workflows/ci.yml
+
   prepare:
-    name: Prepare benchmarks
+    name: Prepare environment
     runs-on: ubuntu-latest
+    needs: build_test
+    timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - name: Download locally built preact package
+        uses: actions/download-artifact@v3
         with:
-          node-version: 14.x
-          cache: npm
-      - run: npm ci
-      - run: pushd benches && npm ci; popd # Prime benchmark npm cache
-      - name: Package
-        # Use --ignore-scripts here to avoid re-building again before pack
-        run: |
-          npm pack --ignore-scripts
-          mv preact-*.tgz preact.tgz
-          tar -xzf preact.tgz
-          rm preact.tgz
-      - name: Upload build output
-        uses: actions/upload-artifact@v2
+          name: npm-package
+      - run: mv preact.tgz preact-local.tgz
+      - name: Upload locally built preact package
+        uses: actions/upload-artifact@v3
         with:
-          name: build-output
-          path: package/
-      - uses: andrewiggins/download-base-artifact@v1
+          name: bench-environment
+          path: preact-local.tgz
+      - name: Download base package
+        uses: andrewiggins/download-base-artifact@v2
         with:
           artifact: npm-package
           workflow: ci.yml
           required: false
+      - run: mv preact.tgz preact-master.tgz
       - name: Upload base preact package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: build-output
-          path: preact.tgz
+          name: bench-environment
+          path: preact-master.tgz
+
+  bench_todo:
+    name: Bench todo
+    uses: ./.github/workflows/run-bench.yml
+    needs: prepare
+    with:
+      benchmark: todo
+      timeout: 10
 
   bench_text_update:
     name: Bench text_update
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench text_update.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/text_update.json
+    with:
+      benchmark: text_update
+      timeout: 10
 
   bench_many_updates:
     name: Bench many_updates
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench many_updates.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/many_updates.json
+    with:
+      benchmark: many_updates
+      timeout: 10
 
   bench_02_replace1k:
     name: Bench 02_replace1k
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench 02_replace1k.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/02_replace1k.json
+    with:
+      benchmark: 02_replace1k
 
   bench_03_update10th1k_x16:
     name: Bench 03_update10th1k_x16
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench 03_update10th1k_x16.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/03_update10th1k_x16.json
+    with:
+      benchmark: 03_update10th1k_x16
 
   bench_07_create10k:
     name: Bench 07_create10k
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench 07_create10k.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/07_create10k.json
+    with:
+      benchmark: 07_create10k
 
   bench_hydrate1k:
     name: Bench hydrate1k
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench hydrate1k.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/hydrate1k.json
+    with:
+      benchmark: hydrate1k
 
   bench_filter_list:
     name: Bench filter_list
-    runs-on: ubuntu-latest
-    needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench filter_list.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/filter_list.json
-
-  bench_todo:
-    name: Bench todo
-    runs-on: ubuntu-latest
+    uses: ./.github/workflows/run-bench.yml
     needs: prepare
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14.x
-          cache: npm
-      - uses: actions/download-artifact@v2
-        with:
-          name: build-output
-      - name: install & build
-        run: |
-          cd benches
-          npm ci
-      - name: bench
-        run: |
-          export CHROMEDRIVER_FILEPATH=$(which chromedriver)
-          cd benches
-          npm run bench todo.html
-      - name: Upload results
-        uses: actions/upload-artifact@v2
-        with:
-          name: results
-          path: benches/results/todo.json
+    with:
+      benchmark: filter_list
+      timeout: 10

.github/workflows/ci.yml

@@ -2,6 +2,7 @@ name: CI
 
 on:
   workflow_dispatch:
+  workflow_call:
   pull_request:
     branches:
       - '**'
@@ -15,11 +16,12 @@ jobs:
     name: Build & Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: npm
+          node-version-file: 'package.json'
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
       - run: npm ci
       - name: test
         env:
@@ -31,7 +33,7 @@ jobs:
           npm run lint
           npm run test:unit
       - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@v1.0.1
+        uses: coverallsapp/github-action@1.1.3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Package
@@ -40,7 +42,7 @@ jobs:
           npm pack --ignore-scripts
           mv preact-*.tgz preact.tgz
       - name: Upload npm package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: npm-package
           path: preact.tgz

.github/workflows/release.yml

@@ -1,5 +1,9 @@
 name: Version or Publish
 
+###### TODO ######
+## Update to work with release scripts which create a GH release and upload the
+## built npm package as an artifact
+
 on:
   push:
     branches: