@hedia/types 2.1.38-alpha.0 → 2.1.39-alpha.0

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

@@ -44,54 +44,12 @@ jobs:
           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
-        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
-        uses: peter-evans/create-or-update-comment@v1
+      - name: Autobump & Publish
+        uses: hedia-team/autobump-and-publish@master
         with:
+          label: ${{ toJson(github.event.pull_request.labels.*.name) }}
+          npm-token: ${{ env.NPM_TOKEN }}
           issue-number: ${{ github.event.number }}
-          body: |
-            🎉  Successfully released alpha version  🎉
-            ✅  ${{ steps.publish-alpha.outputs.version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-ci: true
+          run-tsc: true

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

@@ -25,31 +25,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - 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
+      - name: Publish
+        uses: hedia-team/autobump-and-publish@master
         with:
+          npm-token: ${{ env.NPM_TOKEN }}
           issue-number: ${{ github.event.number }}
-          body: |
-            🎉  Successfully released package  🎉
-            ✅  ${{ steps.publish-package.outputs.version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          is-post-merge: true
+          run-ci: true
+          run-tsc: true

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

@@ -13,11 +13,6 @@ 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]
@@ -44,56 +39,13 @@ jobs:
           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:
-          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
+      - name: Autobump & Publish
         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
-        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
-        uses: peter-evans/create-or-update-comment@v1
+        uses: hedia-team/autobump-and-publish@master
         with:
+          label: ${{ toJson(github.event.pull_request.labels.*.name) }}
+          npm-token: ${{ env.NPM_TOKEN }}
           issue-number: ${{ github.event.number }}
-          body: |
-            🎉  Successfully released alpha version  🎉
-            ✅  ${{ needs.on-push-commit-bump-and-publish-alpha.outputs.version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-ci: true
+          run-tsc: true

package/bump-package-version.sh

@@ -0,0 +1,80 @@
+# @latest on npm
+latestVersionNPM=$(npm show ./ dist-tags.latest --json)
+echo "Latest dist-tag version on npm: $latestVersionNPM"
+
+# Initial package.json version
+packageJSONVersion=$(sed -nE 's/^\s*"version": "([0-9]+.[0-9]+.[0-9]+).*?",$/\1/p' package.json)
+echo "Initial package.json version: $packageJSONVersion"
+
+npmV=`echo $latestVersionNPM | sed 's/\.//g' | bc`
+pkgV=`echo $packageJSONVersion | sed 's/\.//g' | bc`
+
+# Check if the packageJSONVersion is up to date.
+# Otherwise, bump the package.json version, accordingly to the label.
+if [[ $npmV -lt $pkgV ]]; then
+    echo "package.json version is up to date"
+else
+	# Set package.json to latest NPM version prior to bump version
+	sed -i 's/\("version": \)\("[0-9]\+.[0-9]\+.[0-9]\+\)\(\"\)/\1\'$latestVersionNPM'/' package.json
+    case "$1" in
+	*"major"*)
+		echo "Bumping pre-major version"
+		echo "$(npm version --no-git-tag-version premajor --preid alpha)"
+		;;
+	*"minor"*)
+		echo "Bumping pre-minor version"
+		echo $(npm version --no-git-tag-version preminor --preid alpha)
+		;;
+	*"patch"*)
+		echo "Bumping pre-patch version"
+		echo "$(npm version --no-git-tag-version prepatch --preid alpha)"
+		;;
+	*)
+		echo "No [major, minor, patch] label has been set"
+		;;
+  esac
+fi
+
+# Get all published versions on npm.
+allVersionsArray=$(npm show ./ versions)
+# Get the current version from the package.json
+upToDatePackageJSON=$(sed -nE 's/^\s*"version": "([0-9]+.[0-9]+.[0-9]+).*?",$/\1/p' package.json)
+
+# Identify the latest published alpha (if any) on npm, of the upToDatePackageJSON.
+for i in ${allVersionsArray[@]}
+do
+	if [[ $i == *$upToDatePackageJSON* ]]; then
+		latestAlphaVersion=$(echo $i)
+	fi
+done
+
+# Get the alpha counter value of the latest alpha version (for the upToDatePackageJSON version).
+alphaVersionCounter="$(echo "$latestAlphaVersion" | grep -oP '(?:-alpha.)\K\d+')"
+
+# Bumping the alphaVersionCounter by 1.
+if [[ "$alphaVersionCounter" != "" ]];
+	then
+		alphaVersionCounter="$((alphaVersionCounter+1))"
+	else
+		alphaVersionCounter="0"
+fi
+
+# Get the current packageVersion and check if -alpha.X tag has been set (in case of package.json version bump (Open PR))
+packageVersion=$(sed -nE 's/^\s*"version": "(.*?)",$/\1/p' package.json)
+if [[ "$packageVersion" == *"-alpha"* ]];
+then
+	# On open PR
+	# Set alpha tag to the correspondent version
+	echo "Setting alpha version to $alphaVersionCounter"
+	sed -i 's/\("version": "[0-9]\+.[0-9]\+.[0-9]\+\)\(-alpha.\)\([0-9]\)/\1\'-alpha.$alphaVersionCounter'/' package.json
+	bumpedPackageVersion=$(sed -nE 's/^\s*"version": "([0-9]+.[0-9]+.[0-9]+).*?",$/\1/p' package.json)
+	# Commit changes
+	git add package.json
+	git commit -m "autobump $bumpedPackageVersion"
+else
+	echo "on push"
+	# On push commit
+	# Set alpha tag to the correspondent version
+	echo "Setting alpha version to $alphaVersionCounter"
+	sed -i 's/\("version": "\)\([0-9]\+\.[0-9]\+\.[0-9]\+\)\("\)/\1\2\-alpha.'$alphaVersionCounter'\3/' package.json
+fi

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@hedia/types",
-  "version": "2.1.38-alpha.0",
-  "alphaVersionCounter": "0",
+  "version": "2.1.39-alpha.0",
   "description": "Enums, interfaces, and other common types for use in Hedia's software.",
   "main": "dist/index.js",
   "repository": {
@@ -11,9 +10,7 @@
   "scripts": {
     "tsc": "tsc --build",
     "clean": "tsc --build --clean",
-    "prepublish": "npm ci --ignore-scripts && npm run tsc",
-    "postpublish": "npm run clean",
-    "bump-alpha": "chmod +x ./alpha-release.sh && ./alpha-release.sh"
+    "postpublish": "npm run clean"
   },
   "keywords": [],
   "author": "Hedia",

package/remove-alpha-tag.sh

@@ -1,19 +1,15 @@
-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)"
 
+previousCommit="$(git log -1 --pretty=%B)"
 
 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" ]; 
+if [[ "$previousCommit" == *"autobump"* ]];
     then
-        git commit --amend -m "autobump ${versionNumber}-alpha.${alphaVersion}"
-    else
-        git commit -m "autobump ${versionNumber}-alpha.${alphaVersion}"
-fi
-
+        git add package.json
+        git commit --amend --no-edit
+        git push
+fi

package/.github/workflows/ci.yml

@@ -1,24 +0,0 @@
-name: Node.js CI
-
-on:
-  pull_request:
-
-jobs:
-  build:
-    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 }}
-
-      - run: npm ci
-        env:
-          CI: true

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

@@ -1,8 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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