Merge remote-tracking branch 'origin/master' into new-version-for-lib

# Conflicts:
#	.github/workflows/bump-version.yml
#	.github/workflows/ci.yml
#	.github/workflows/publish.yml

Author: klerick

.github/actions/action.yml

@@ -0,0 +1,35 @@
+name: 'My composite action'
+description: 'Checks out the repository and install'
+runs:
+  using: 'composite'
+  steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20
+    - name: Restore cached npm dependencies
+      id: cache-dependencies-restore
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          node_modules
+          ~/.cache/Cypress # needed for the Cypress binary
+        key: ${{ runner.os }}npm-dependencies-${{ hashFiles('package-lock.json') }}
+    - name: Npm install
+      run: npm ci
+      shell: bash
+    - name: Cache npm dependencies
+      id: cache-dependencies-save
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          node_modules
+          ~/.cache/Cypress # needed for the Cypress binary
+        key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
+    - name: Derive appropriate SHAs for base and head for `nx affected` commands
+      uses: nrwl/nx-set-shas@v4
+      with:
+        main-branch-name: "master"

.github/workflows/bump-version.yml

@@ -1,14 +1,10 @@
-name: Bump-version
+name: Create Releases
 on:
-  pull_request:
-    types:
-      - closed
-    branches:
-      - main
+  workflow_dispatch:
+
 jobs:
   build-and-test:
     name: "Build and test"
-    if: ${{ github.event.pull_request.merged == true }}
     runs-on: ubuntu-latest
     permissions:
       contents: "read"
@@ -17,35 +13,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Restore cached npm dependencies
-        id: cache-dependencies-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ runner.os }}npm-dependencies-${{ hashFiles('package-lock.json') }}
-      - run:  npm ci
-      - name: Cache npm dependencies
-        id: cache-dependencies-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v4
-        with:
-          main-branch-name: "main"
+      - name: Npm install
+        uses: ./.github/actions
       - run: npx nx affected -t lint test build --parallel=3 --exclude='test-npm' --base=origin/main~1 --head=origin/main
-
 #      - run: npm nx affected -t e2e-ci --parallel=1
 #      - run: npm nx affected -t deploy --no-agents
+
   bump-version:
     name: "Bump version"
     needs:
@@ -65,27 +38,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-      - name: Restore cached npm dependencies
-        id: cache-dependencies-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ runner.os }}npm-dependencies-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - name: Cache npm dependencies
-        id: cache-dependencies-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v4
-        with:
-          main-branch-name: "main"
+      - name: Checkout and install
+        uses: ./.github/actions
       - name: Bump version
         run: |
           git config user.name 'Alex H'

.github/workflows/ci.yml

@@ -7,37 +7,14 @@ on:
       - opened
       - synchronize
 jobs:
-  main:
+  run-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Restore cached npm dependencies
-        id: cache-dependencies-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ runner.os }}-npm-dependencies-${{ hashFiles('package-lock.json') }}
-      - run:  npm ci
-      - name: Cache npm dependencies
-        id: cache-dependencies-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v4
-        with:
-          main-branch-name: "main"
+      - name: Npm install
+        uses: ./.github/actions
       # This line is needed for nx affected to work when CI is running on a PR
       - run: git branch --track main origin/main
       - run: npx nx affected -t lint test build --parallel=3 --exclude='test-npm'

.github/workflows/publish.yml

@@ -2,12 +2,16 @@ name: Publish
 
 on:
   workflow_run:
-    workflows: [ "Bump-version" ]
+    workflows: [ "Create Releases" ]
     types:
       - completed
+env:
+  NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+  NPM_CONFIG_PROVENANCE: true
 
 jobs:
-  test:
+  publish:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     name: Publish
     runs-on: ubuntu-latest
     permissions:
@@ -19,36 +23,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          registry-url: https://registry.npmjs.org/
-      - name: Restore cached npm dependencies
-        id: cache-dependencies-restore
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ runner.os }}npm-dependencies-${{ hashFiles('package-lock.json') }}
-      - run: npm ci
-      - name: Cache npm dependencies
-        id: cache-dependencies-save
-        uses: actions/cache/save@v4
-        with:
-          path: |
-            node_modules
-            ~/.cache/Cypress # needed for the Cypress binary
-          key: ${{ steps.cache-dependencies-restore.outputs.cache-primary-key }}
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v4
-        with:
-          main-branch-name: "main"
+      - name: Npm install
+        uses: ./.github/actions
       - run: npx nx affected -t build --parallel=3 --exclude='test-npm' --base=origin/main~1 --head=origin/main
       - name: Publish packages
         run: npx nx release publish
         shell: bash
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-          NPM_CONFIG_PROVENANCE: true