[FEAT] Change release behavior

.github/pull_request_template.md

@@ -20,5 +20,5 @@ Fixes # <!-- Issue number --->
 - [<!-- x --> ] I have performed a self-review of my code
 - [<!-- x --> ] I have commented my code, particularly in hard-to-understand areas
 - [<!-- x --> ] I have made corresponding changes to the documentation
-- [<!-- x --> ] I have tested my changes in Obsidian and describte how I tested in [Tests](#tests)
+- [<!-- x --> ] I have tested my changes in Obsidian and describe how I tested in [Tests](#tests)
 - [<!-- x --> ] My code fixes the feature discussed in [Related Issues](#related-issues) if not or not fully describe what is missing in [Missing changes](#missing-changes)

.github/workflows/cd.yml

@@ -1,74 +1,50 @@
-name: Continuous Deployment
+name: Continuous Delivery
+
 on:
   pull_request:
     types:
       - closed
     branches: 
       - master  
-  workflow_dispatch:
 
 jobs:
   release:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
     permissions: 
-        pull-requests: write
         contents: write
 
     steps: 
       - name: Checkout
         id: checkout
         uses: actions/checkout@v4
 
-      - name: Use Node.js 18.x
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18.x
-
-      - name: Install Dependencies
-        run: npm install
+      - name: Process Pull Request
+        id: process-pr
+        run: |
+          LABELS=$(jq -r '.pull_request.labels[].name' "$GITHUB_EVENT_PATH")
+          echo "::debug::Labels: $LABELS"
 
-      - name: Bump version
-        id: version-bump
-        uses: 4Source/version-control-action@v1
-        with: 
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          owner: ${{ github.repository_owner }}
-          repository:  ${{ github.event.repository.name }}
-          pr_number: ${{ github.event.number }}
-          tag_prefix: ''
-          dry_run: true
+          if echo "$LABELS" | grep -q 'major'; then
+            RELEASE_TYPE_TAG="major"
+          elif echo "$LABELS" | grep -q 'minor'; then
+            RELEASE_TYPE_TAG="minor"
+          elif echo "$LABELS" | grep -q 'patch'; then
+            RELEASE_TYPE_TAG="patch"
+          else
+            echo "::error::No tag found matching a release type."
+            exit 1
+          fi
 
-      - name: Configure git
-        run: |
-          git config --global user.name "4Source"
-          git config --global user.email "38220764+4Source@users.noreply.github.com."
+          echo "Release tag: $RELEASE_TYPE_TAG"
+          echo "release_type=$RELEASE_TYPE_TAG" >> $GITHUB_OUTPUT
 
-      - name: Change version in files
-        run: | 
-          npm run version -- --new_version=${{ steps.version-bump.outputs.new_version }}
-
-      - name: Commit and push changes
+      - name: Configure git
         run: |
-          git commit -a -m "Apply version ${{ steps.version-bump.outputs.new_version }}"
-          git push -f 
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-      - name: Push version tag
+      - name: Create or Update release type tag
         run: |
-          git tag -a ${{ steps.version-bump.outputs.new_version }} -m "${{ steps.version-bump.outputs.new_version }}"
-          git push -f origin ${{ steps.version-bump.outputs.new_version }}
-
-      - name: Build plugin
-        run: npm run build
-
-      - name: Create release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          FILES="main.js manifest.json"
-          if [ -f styles.css ]; then
-            FILES="$FILES styles.css"
-          fi
-          gh release create "${{ steps.version-bump.outputs.new_version }}" \
-            --title "${{ steps.version-bump.outputs.new_version }}" \
-            --draft $FILES
+          git tag -fa ${{ steps.process-pr.outputs.release_type }} -m "${{ steps.process-pr.outputs.release_type }}"
+          git push origin -f ${{ steps.process-pr.outputs.release_type }}

.github/workflows/ci.yml

@@ -2,18 +2,21 @@ name: Continuous Integration
 
 on: 
   pull_request:
-    branches:
-      - master
+    types: 
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
     paths: 
       - 'src/**'
       - 'test/**'
   push: 
-    branches:
-      - master
     paths: 
       - 'src/**'
       - 'test/**'
-  workflow_dispatch:
+    branches: 
+       - master  
 
 jobs:
   test:
@@ -100,8 +103,6 @@ jobs:
     name: Version Bump 
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
-    permissions: 
-      pull-requests: write
 
     steps:
       - name: Checkout
@@ -115,4 +116,165 @@ jobs:
           repository:  ${{ github.event.repository.name }}
           pr_number: ${{ github.event.number }}
           tag_prefix: ''
-          dry_run: true
+          dry_run: true
+
+  beta-release:
+    name: Beta releases for pull requests
+    runs-on: ubuntu-latest
+    needs: 
+      - test 
+      - build 
+      - version
+    # TODO: Beta releases are currently disabled
+    if: github.event_name == 'pull_request' && false
+
+    permissions: 
+      pull-requests: write
+      contents: write
+
+    steps: 
+      - name: Checkout
+        id: checkout
+        # TODO: Have to use this commit because fetch-tags is not working in main till this is merged to main
+        uses: actions/checkout@0548471950d86b19eae6c063105707c831fb5c03
+        with:
+          ref: ${{ github.event.ref }}
+          fetch-tags: true
+
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.x
+
+      - name: Check changes since last release
+        id: changes
+        run: |
+          echo "skip=false" >> $GITHUB_OUTPUT
+
+          echo "::debug::Tags: git tag --list"
+
+          # Find the latest semver tag
+          LAST_VERSION_TAG=$(git tag --list | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | grep -v '-' | sort -V | tail -n1 || echo "")
+
+          if [ -z "$LAST_VERSION_TAG" ]; then
+            echo "No previous tag found. Assuming first release."
+          else
+            echo "Last tag: $LAST_VERSION_TAG"
+            if git diff --quiet "$LAST_VERSION_TAG"..HEAD -- src/; then
+              echo "No changes in /src since last release."
+              echo "skip=true" >> $GITHUB_OUTPUT
+              exit 0
+            else
+              echo "::debug::Changes detected in /src since last release."
+            fi
+          fi
+
+          # Find the highest release type
+          if git tag --list | grep -q 'major'; then
+            RELEASE_TYPE_TAG="major"
+          elif git tag --list | grep -q 'minor'; then
+            RELEASE_TYPE_TAG="minor"
+          elif git tag --list | grep -q 'patch'; then
+            RELEASE_TYPE_TAG="patch"
+          else
+            echo "::error::No tag found matching a release type."
+            exit 1
+          fi
+
+          echo "Release tag: $RELEASE_TYPE_TAG"
+          echo "release_type=$RELEASE_TYPE_TAG" >> $GITHUB_OUTPUT
+
+
+      - name: Install Dependencies
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        run: npm install
+
+      - name: Bump version
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        id: version-bump
+        uses: 4Source/version-control-action@v1
+        with: 
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          owner: ${{ github.repository_owner }}
+          repository:  ${{ github.event.repository.name }}
+          version_increase: ${{ steps.changes.outputs.release_type }}
+          tag_prefix: ''
+          dry_run: true
+          # TODO: Is beta + beta string 
+
+      - name: Configure git
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Change version in files
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        run: | 
+          npm run version -- --new_version=${{ steps.version-bump.outputs.new_version }}
+          git add manifest.json versions.json package.json
+
+      - name: Commit and push changes
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        run: |
+          git commit -a -m "Apply version ${{ steps.version-bump.outputs.new_version }}"
+          git push
+
+      - name: Push version tag
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        run: |
+          git tag -a ${{ steps.version-bump.outputs.new_version }} -m "${{ steps.version-bump.outputs.new_version }}"
+          git push origin ${{ steps.version-bump.outputs.new_version }}
+
+      - name: Build plugin
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        id: build-plugin
+        run: |
+          npm run build
+
+          if [ ! -f main.js ]; then
+            echo "Error: main.js is missing."
+            exit 1
+          fi
+
+          if [ ! -f manifest.json ]; then
+            echo "Error: manifest.json is missing."
+            exit 1
+          fi
+
+          FILES="main.js manifest.json"
+          if [ -f styles.css ]; then
+            FILES="$FILES styles.css"
+          fi
+          echo "release_files=$FILES" >> $GITHUB_OUTPUT
+
+      - name: Create release
+        if: ${{ steps.changes.outputs.skip == 'false' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          FILES="${{ steps.build-plugin.outputs.release_files }}"
+          gh release create "${{ steps.version-bump.outputs.new_version }}" \
+            --title "${{ steps.version-bump.outputs.new_version }}" \
+            --generate-notes \
+            $FILES
+
+      - name: Remove release type tags
+        run: |
+          FAILED=0
+
+          for tag in major minor patch; do
+            if [ -n "$(git tag -l "$tag")" ]; then
+              echo "Deleting remote tag: $tag"
+              if git push --delete origin $tag; then
+                echo "::debug::Deleted remote tag $tag"
+              else
+                echo "::error::Failed to delete remote tag $tag"
+                FAILED=1
+              fi
+            else
+              echo "::debug::No $tag tag found locally."
+            fi
+          done
+
+          exit $FAILED