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

package/.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+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 }}
+
+jobs:
+  build:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15]
+
+    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

@@ -0,0 +1,105 @@
+name: NPM - Version Bump & Publish Alpha
+
+on:
+  pull_request:
+    branches:
+      - master
+    types: [opened]
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
+
+jobs:
+  on-open-pr-publish-alpha:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - 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 }}
+
+      - 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"
+          git config --global user.name "Hedia CI Bot"
+
+      - name: Amend [major] to Latest Commit
+        if: "contains(github.event.pull_request.labels.*.name, 'Major')"
+        run: |
+          npm version premajor --preid alpha
+
+      - name: Amend [minor] to Latest Commit
+        if: "!contains(github.event.pull_request.labels.*.name, 'Major') && contains(github.event.pull_request.labels.*.name, 'Minor')"
+        run: |
+          npm version preminor --preid alpha
+
+      - name: Amend [patch] to Latest Commit
+        if: "!contains(github.event.pull_request.labels.*.name, 'Major') && !contains(github.event.pull_request.labels.*.name, 'Minor')"
+        run: |
+          npm version prepatch --preid alpha
+
+      - name: Bump alpha version
+        run: |
+          chmod +x ./on-open-pr-bump-alpha-release.sh && ./on-open-pr-bump-alpha-release.sh
+
+      - name: Publish alpha version
+        id: publish-alpha
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+          tag: alpha
+
+      - name: Check if version exists
+        if: steps.publish-alpha.outputs.type == 'none'
+        run: |
+          echo "Package JSON version is already published, please bump the version!"
+          exit 1
+
+      - name: Remove alpha tag
+        run: |
+          chmod +x ./remove-alpha-tag.sh && ./remove-alpha-tag.sh
+          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 }}
+          delete_user_name: github-actions[bot]
+          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 }}

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

@@ -0,0 +1,59 @@
+name: NPM Publish Bot - Publish package
+
+on:
+  pull_request:
+    branches:
+      - master
+    types: [closed]
+
+env:
+  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
+  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
+
+jobs:
+  on-post-merge-publish-package:
+    if: github.event.pull_request.merged == true
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.15]
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        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
+        with:
+          token: ${{ env.NPM_TOKEN }}
+
+      - name: Check if version exists
+        if: steps.publish-package.outputs.type == 'none'
+        run: |
+          echo "Package JSON version is already published, please bump the version!"
+          exit 1
+
+      - name: Remove old comment from PR
+        if: steps.publish-package.outputs.type != 'none'
+        uses: izhangzhihao/delete-comment@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          delete_user_name: github-actions[bot]
+          issue_number: ${{ github.event.number }} # remove comments from the current PR
+
+      - name: Write comment on PR
+        if: steps.publish-package.outputs.type != 'none'
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ github.event.number }}
+          body: |
+            🎉  Successfully released package  🎉
+            ✅  ${{ steps.publish-package.outputs.version }}

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

@@ -0,0 +1,84 @@
+name: NPM Bumper - Bump alpha version
+
+on:
+  pull_request:
+    branches:
+      - master
+    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
+
+    strategy:
+      matrix:
+        node-version: [14.15]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - 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 }}
+
+      - name: Set identity
+        run: |
+          git config --global user.email "ci@hedia.co"
+          git config --global user.name "Hedia CI Bot"
+
+      - name: Bump alpha version
+        run: |
+          chmod +x ./on-push-commit-bump-alpha.sh && ./on-push-commit-bump-alpha.sh
+
+      - name: Publish alpha version
+        id: publish-alpha
+        uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ env.NPM_TOKEN }}
+          tag: alpha
+
+      - name: Check if version exists
+        if: steps.publish-alpha.outputs.type == 'none'
+        run: |
+          echo "Package JSON version is already published, please bump the version!"
+          exit 1
+
+      - name: Remove alpha tag
+        run: |
+          chmod +x ./remove-alpha-tag.sh && ./remove-alpha-tag.sh
+          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 }}
+          delete_user_name: github-actions[bot]
+          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 }}

package/on-open-pr-bump-alpha-release.sh

@@ -0,0 +1,8 @@
+alphaNumber="$(sed -n 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)\(,\)/\2/p' package.json)"
+bumpedAlphaNumber="$((alphaNumber+1))"
+
+alphaVersion="$(sed -nE 's/^\s*"alphaVersionCounter": "(.*?)",$/\1/p' package.json)"
+bumpedAlphaVersion="$((alphaVersion+1))"
+
+sed -i 's/\("alphaVersionCounter": "\)\([0-9]\+\)\("\)/\1'0'\3/' package.json
+sed -i 's/\("version": "\)\([0-9]\+\.[0-9]\+\.[0-9]\+\)\("\)/\1\2\-alpha.'0'\3/' package.json

package/on-push-commit-bump-alpha.sh

@@ -0,0 +1,8 @@
+alphaNumber="$(sed -n 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)\(,\)/\2/p' package.json)"
+bumpedAlphaNumber="$((alphaNumber+1))"
+
+alphaVersion="$(sed -nE 's/^\s*"alphaVersionCounter": "(.*?)",$/\1/p' package.json)"
+bumpedAlphaVersion="$((alphaVersion+1))"
+
+sed -i 's/\("version": "\)\([0-9]\+\.[0-9]\+\.[0-9]\+\)\("\)/\1\2\-alpha.'$bumpedAlphaVersion'\3/' package.json
+sed -i 's/\("alphaVersionCounter": "\)\([0-9]\+\)\("\)/\1'$bumpedAlphaVersion'\3/' package.json

package/package.json

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

package/remove-alpha-tag.sh

@@ -0,0 +1,19 @@
+versionNumber=$(sed -nE 's/^\s*"version": "([0-9].[0-9].[0-9]).*?",$/\1/p' package.json)
+alphaNumber="$(sed -n 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)\(,\)/\2/p' package.json)"
+alphaVersion="$(sed -nE 's/^\s*"alphaVersionCounter": "(.*?)",$/\1/p' package.json)"
+
+
+if [ "$alphaNumber" != "" ]; 
+    then
+        sed -i 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\)\(-alpha\.\)\([0-9]\+\)\("\)/\1\4/' package.json
+fi
+
+git add package.json
+
+if [ "$alphaVersion" = "" ] || [ $alphaVersion = "0" ]; 
+    then
+        git commit --amend -m "bump ${versionNumber}-alpha.${alphaVersion}"
+    else
+        git commit -m "bump ${versionNumber}-alpha.${alphaVersion}"
+fi
+

package/.github/workflows/post-merge.yml

@@ -1,60 +0,0 @@
-name: Post-merge - Publish & Update package version
-
-on:
-  pull_request:
-    branches:
-      - master
-    types: [closed]
-
-env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
-  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
-
-jobs:
-  publish-package-push-master:
-    if: github.event.pull_request.merged == true
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [14.15]
-
-    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}"
-              
-      - name: Removing alpha tag from package json
-        run: chmod +x ./pre-release.sh && ./pre-release.sh
-        
-      - name: Installing dependencies
-        run: npm ci
-
-      - id: publish
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ env.NPM_TOKEN }}
-
-      - if: steps.publish.outputs.type == 'none'
-        run: |
-          echo "Failed to publish on npm, version already exists"
-          exit 1  
-
-      - name: Commit & Push changes
-        uses: actions-js/push@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: 'master'
-          message: 'Post-publish master package version update'

package/.github/workflows/publish-alpha.yaml

@@ -1,54 +0,0 @@
-name: NPM Alpha Publish Bot
-
-on:
-  pull_request:
-      
-env:
-  SSH_PRIVATE_KEY: ${{ secrets.HEDIA_BOT_PRIVATE_SSH_KEY }}
-  NPM_TOKEN: ${{ secrets.HEDIA_BOT_NPM_TOKEN }}
-
-jobs:
-  publish-alpha-npm-package:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - 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}"
-
-      - name: Installing dependencies
-        run: npm ci
-     
-      - id: publish-alpha
-        uses: JS-DevTools/npm-publish@v1
-        with:
-          token: ${{ env.NPM_TOKEN }}
-          tag: alpha
-
-      - if: steps.publish-alpha.outputs.type == 'none'
-        run: |
-          echo "Package JSON version is already published, please bump the version!"
-          exit 1
-
-      - if: steps.publish-alpha.outputs.type != 'none'
-        uses: izhangzhihao/delete-comment@master
-        with: 
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          delete_user_name: github-actions[bot]
-          issue_number: ${{ github.event.number }}  # remove comments from the current PR
-      
-      - if: steps.publish-alpha.outputs.type != 'none'
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            🎉  Successfully released alpha version  🎉
-            ✅  ${{ steps.publish-alpha.outputs.version }}

package/alpha-release.sh

@@ -1,11 +0,0 @@
-alphaNumber="$(sed -n 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)\(,\)/\2/p' package.json)"
-bumped="$((alphaNumber+1))"
-if [ "$alphaNumber" = "" ]; 
-    then
-        sed -i 's/\("version": "\)\([0-9]\+\.[0-9]\+\.[0-9]\+\)\("\)/\1\2\-alpha.1\3/' package.json
-    else
-        echo $bumped
-        sed -i 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)/\1'$bumped'\3/' package.json
-fi
-
-git commit package.json -m "bump alpha release to ${bumped}"

package/pre-release.sh

@@ -1,5 +0,0 @@
-alphaNumber="$(sed -n 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\-alpha\.\)\([0-9]\+\)\("\)\(,\)/\2/p' package.json)"
-if [ "$alphaNumber" != "" ]; 
-    then
-        sed -i 's/\("version": "[0-9]\+\.[0-9]\+\.[0-9]\+\)\(-alpha\.\)\([0-9]\+\)\("\)/\1\4/' package.json
-fi