@hedia/types 2.1.36-alpha.0 → 2.1.36-alpha.1

package/.github/workflows/ci.yml

@@ -1,19 +1,10 @@
 name: Node.js CI
 
 on:
-  workflow_run:
-    workflows: ["NPM - Version Bump & Publish Alpha", "NPM Bumper - Bump alpha version"]
-    types: 
-      - completed
-
-env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
-  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
+  pull_request:
 
 jobs:
   build:
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -22,23 +13,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      
+
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-      
-      - name: Register ssh keys
-        uses: webfactory/ssh-agent@v0.5.3
-        with:
-          ssh-private-key: |
-            ${{ env.SSH_PRIVATE_KEY }}
-      
-      - name: Register NPM access token
-        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-        env:
-          NPM_TOKEN: ${{ env.NPM_TOKEN }}
-      
+
       - run: npm ci
         env:
           CI: true

package/.github/workflows/on-open-pr-publish-alpha.yaml

@@ -1,4 +1,4 @@
-name: NPM - Version Bump & Publish Alpha
+name: On open PR - Version Bump & Publish Alpha
 
 on:
   pull_request:
@@ -7,11 +7,21 @@ on:
     types: [opened]
 
 env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
   NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
 
 jobs:
+  validate-pr-labels:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Validate PR labels
+        uses: docker://agilepathway/pull-request-label-checker:v1.0.102
+        with:
+          one_of: major,minor,patch
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+
   on-open-pr-publish-alpha:
+    needs: [validate-pr-labels]
     runs-on: ubuntu-latest
 
     strategy:
@@ -28,23 +38,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Register ssh keys
-        uses: webfactory/ssh-agent@v0.5.3
-        with:
-          ssh-private-key: |
-            ${{ env.SSH_PRIVATE_KEY }}
-
-      - name: Register NPM access token
-        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-        env:
-          NPM_TOKEN: ${{ env.NPM_TOKEN }}
-
-      - name: Validate PR labels
-        uses: docker://agilepathway/pull-request-label-checker:v1.0.102
-        with:
-          one_of: major,minor,patch
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set identity
         run: |
           git config --global user.email "ci@hedia.co"
@@ -88,7 +81,6 @@ jobs:
           git push
 
       - name: Remove old comment from PR
-        if: steps.publish-alpha.outputs.type != 'none'
         uses: izhangzhihao/delete-comment@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -96,7 +88,6 @@ jobs:
           issue_number: ${{ github.event.number }} # remove comments from the current PR
 
       - name: Write comment on PR
-        if: steps.publish-alpha.outputs.type != 'none'
         uses: peter-evans/create-or-update-comment@v1
         with:
           issue-number: ${{ github.event.number }}

package/.github/workflows/on-post-merge-publish-package.yaml

@@ -1,4 +1,4 @@
-name: NPM Publish Bot - Publish package
+name: On post-merge - Publish package
 
 on:
   pull_request:
@@ -7,7 +7,6 @@ on:
     types: [closed]
 
 env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
   NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
 
 jobs:
@@ -26,9 +25,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Register NPM access token
-        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-
       - name: Publish package
         id: publish-package
         uses: JS-DevTools/npm-publish@v1

package/.github/workflows/on-push-commit-bump-and-publish-alpha.yaml

@@ -1,4 +1,4 @@
-name: NPM Bumper - Bump alpha version
+name: On push - Bump & publish alpha version
 
 on:
   pull_request:
@@ -7,13 +7,17 @@ on:
     types: [synchronize]
 
 env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
   NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
 
 jobs:
   on-push-commit-bump-and-publish-alpha:
     runs-on: ubuntu-latest
 
+    outputs:
+      type: ${{ steps.publish-alpha.outputs.type }}
+      version: ${{ steps.publish-alpha.outputs.version }}
+      skip: ${{ env.CI_SKIP }}
+
     strategy:
       matrix:
         node-version: [14.15]
@@ -22,33 +26,31 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.ref }}
+          token: ${{ secrets.HEDIA_BOT_GITHUB_PAT }}
+
+      - uses: mstachniuk/ci-skip@v1
+        with:
+          commit-filter: "autobump"
 
       - name: Use Node.js ${{ matrix.node-version }}
+        if: ${{ env.CI_SKIP == 'false' }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Register ssh keys
-        uses: webfactory/ssh-agent@v0.5.3
-        with:
-          ssh-private-key: |
-            ${{ env.SSH_PRIVATE_KEY }}
-
-      - name: Register NPM access token
-        run: npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-        env:
-          NPM_TOKEN: ${{ env.NPM_TOKEN }}
-
       - name: Set identity
+        if: ${{ env.CI_SKIP == 'false' }}
         run: |
           git config --global user.email "ci@hedia.co"
           git config --global user.name "Hedia CI Bot"
 
       - name: Bump alpha version
+        if: ${{ env.CI_SKIP == 'false' }}
         run: |
           chmod +x ./on-push-commit-bump-alpha.sh && ./on-push-commit-bump-alpha.sh
 
       - name: Publish alpha version
+        if: ${{ env.CI_SKIP == 'false' }}
         id: publish-alpha
         uses: JS-DevTools/npm-publish@v1
         with:
@@ -62,12 +64,26 @@ jobs:
           exit 1
 
       - name: Remove alpha tag
+        if: ${{ env.CI_SKIP == 'false' }}
         run: |
           chmod +x ./remove-alpha-tag.sh && ./remove-alpha-tag.sh
           git push
 
+  after-publish:
+    runs-on: ubuntu-latest
+    needs: [on-push-commit-bump-and-publish-alpha]
+    if: needs.on-push-commit-bump-and-publish-alpha.outputs.skip == 'false'
+
+    strategy:
+      matrix:
+        node-version: [14.15]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
       - name: Remove old comment from PR
-        if: steps.publish-alpha.outputs.type != 'none'
         uses: izhangzhihao/delete-comment@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -75,10 +91,9 @@ jobs:
           issue_number: ${{ github.event.number }} # remove comments from the current PR
 
       - name: Write comment on PR
-        if: steps.publish-alpha.outputs.type != 'none'
         uses: peter-evans/create-or-update-comment@v1
         with:
           issue-number: ${{ github.event.number }}
           body: |
             🎉  Successfully released alpha version  🎉
-            ✅  ${{ steps.publish-alpha.outputs.version }}
+            ✅  ${{ needs.on-push-commit-bump-and-publish-alpha.outputs.version }}

package/.github/workflows/validate-pr-title.yaml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - master
+    types: [opened, reopened, edited, synchronize]
 
 permissions:
   pull-requests: read

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hedia/types",
-  "version": "2.1.36-alpha.0",
-  "alphaVersionCounter": "0",
+  "version": "2.1.36-alpha.1",
+  "alphaVersionCounter": "1",
   "description": "Enums, interfaces, and other common types for use in Hedia's software.",
   "main": "dist/index.js",
   "repository": {

package/remove-alpha-tag.sh

@@ -12,8 +12,8 @@ git add package.json
 
 if [ "$alphaVersion" = "" ] || [ $alphaVersion = "0" ]; 
     then
-        git commit --amend -m "bump ${versionNumber}-alpha.${alphaVersion}"
+        git commit --amend -m "autobump ${versionNumber}-alpha.${alphaVersion}"
     else
-        git commit -m "bump ${versionNumber}-alpha.${alphaVersion}"
+        git commit -m "autobump ${versionNumber}-alpha.${alphaVersion}"
 fi