Merge pull request #63 from jh-devv/jh-devv-force

ci!: Overhauled some stuff :3

Author: jh-devv

.github/actions/build/action.yml

@@ -19,19 +19,25 @@ runs:
   using: "composite"
 
   steps:
+
+    # --- Checkout the repo
     - name: Check Out Git Repository
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
         ref: 'main'
 
+
+    # --- Install Packwiz
     - name: Install packwiz
       uses: supplypike/setup-bin@v3
       with:
         uri: "https://nightly.link/packwiz/packwiz/workflows/go/main/Linux%2064-bit%20x86.zip"
         name: "packwiz"
         version: "linux"
 
+
+    # --- Build Modrinth Pack If Wanted
     - name: Build Modrinth Modpack
       if: inputs.build-modrinth == 'true'
       run: |
@@ -40,6 +46,8 @@ runs:
       shell: bash
       working-directory: ${{ inputs.modpack }}
 
+
+     # --- Build Curseforge Pack If Wanted
     - name: Build CurseForge Modpack
       if: inputs.build-curse == 'true'
       run: |
@@ -48,6 +56,9 @@ runs:
       shell: bash
       working-directory: ${{ inputs.modpack }}
 
+
+    # --- Upload the pack/s to releases
+
     - name: Upload Modrinth Modpack to GitHub Releases
       if: inputs.build-modrinth == 'true'
       run: |

.github/actions/bump-pack/action.yml

@@ -13,19 +13,31 @@ inputs:
     description: 'Path to the pack config file'
     required: false
     default: 'pack.toml'
+  branch:
+    description: "Branch, where to do the bump"
+    required: false
+    default: 'main'
 
 runs:
   using: 'composite'
 
   steps:
+
+    # --- Checkout with the named branch
     - name: Check Out Git Repository
       uses: actions/checkout@v3
+      with:
+        ref: ${{ inputs.branch }}
 
-    - name: Set the version
+
+    # --- Use sed to set the version
+    - name: Set the Version
       run: sed -i 's/version = "[^"]*"/version = "${{ inputs.release-tag }}"/' ${{ inputs.modpack }}/${{ inputs.pack-file }}
       shell: bash
 
-    - name: Push the Updated Version
+
+    # --- Push the version
+    - name: Push The Updated Version
       uses: stefanzweifel/git-auto-commit-action@v4
       with:
         commit_message: "chore(${{ inputs.modpack }}): bump version to ${{ inputs.release-tag }}"

.github/actions/parse/action.yml

@@ -23,9 +23,14 @@ runs:
   using: 'composite'
 
   steps:
+
+    # --- Checkout repo
     - name: Check Out Git Repository
       uses: actions/checkout@v3
 
+
+    # --- Parse the pack.toml
+    # I am bored so sorry that I don't explain this, you should probably read the code?
     - name: Parse the pack.toml
       id: parse
       run: |

.github/actions/release/action.yaml

@@ -36,13 +36,20 @@ inputs:
 runs:
     using: "composite"
     steps:
+
+      # --- Checkout the repo
       - name: Check Out Git Repository
         uses: actions/checkout@v3
 
+
+      # --- Get latest tag
+      # TODO: Should probably be switched to an input
       - name: Get Latest tag
         id: tag
         uses: WyriHaximus/github-action-get-previous-tag@v1
 
+
+      # --- Download the pack files
       - name: Download the pack files
         uses: robinraju/[email protected]
         id: download-files
@@ -52,7 +59,8 @@ runs:
           tarBall: false
           zipBall: false
 
-      
+
+      # --- Get latest release description
       - name: Get latest release description
         uses: cardinalby/git-get-release-action@v1
         id: latest-release
@@ -61,6 +69,8 @@ runs:
         with:
           tag: ${{ steps.tag.outputs.tag }}
 
+
+      # --- Set publish version-type
       - name: Set publish version-type
         id: release-type
         run: |
@@ -73,16 +83,22 @@ runs:
           fi
         shell: bash
 
+
+      # --- Pipe latest release description to file
       - name: Pipe latest release description to file
         run: echo "${{ steps.latest-release.outputs.body }}" > CHANGELOG.release.md
         shell: bash
 
+
+      # --- Print status
       - name: Print status
         run: |
           echo "::notice ::⚙ Assets from latest release ${{ steps.latest-release.outputs.tag_name }} downloaded successfully!"
           echo "::notice ::⚙ Latest release ${{ steps.latest-release.outputs.tag_name }} description piped into a file successfully!"
         shell: bash
 
+
+      # --- Publish to modrinth using the inputs
       - name: Publish to Modrinth
         id: modrinth
         if: inputs.upload-modrinth == 'true'
@@ -103,6 +119,8 @@ runs:
           echo "::notice ::☀ Modpack ${{ inputs.modpack }} has been uploaded to Modrinth with ${{ inputs.MODRINTH_ID }}"
         shell: bash
 
+
+      # --- Publish to curseforge using the inputs
       - name: Publish to CurseForge
         id: curseforge
         if: inputs.upload-curse == 'true'

.github/workflows/pipeline.yml

@@ -27,10 +27,13 @@ jobs:
 
     steps:
 
+      # -- Checkout repo
       - name: Check Out Git Repository
         uses: actions/checkout@v4
 
 
+      # --- Parse the modpacks to and list
+      # This just parses the folders that have pack.toml
       - name: List Modpacks
         id: list_modpacks
         run: |
@@ -45,6 +48,8 @@ jobs:
           
           echo "modpack_folders=$(jq --compact-output --null-input '$ARGS.positional' --args -- "${modpackFolders[@]}")" >> "$GITHUB_OUTPUT"
 
+
+      # --- Print an nice msg about parsing
       - name: Current detected modpacks
         run: |
           echo "::notice ::⚙ Current detected modpacks: ${{ steps.list_modpacks.outputs.modpack_folders }}"
@@ -77,7 +82,7 @@ jobs:
     steps:      
 
       # --- Release please
-
+      # Creates and manages the prs and releases
       - name: Perform Release with Release Please
         id: release-please
         uses: google-github-actions/release-please-action@v3
@@ -94,38 +99,54 @@ jobs:
             {"type":"update","section":"⚘ Modpack Updates","hidden":false},
             {"type":"chore","section":"⛭ Miscellaneous","hidden":true}]
 
+
+      # --- Parse version from PR Title when creating PR's
+      # Had to do this cause like to bump on the release pleae branch
+      # The tests for the shitty Regex can be found here: https://regexr.com/7lb8e
+      - name: Parse tag from PR title
+        uses: actions-ecosystem/action-regex-match@v2
+        id: version
+        with:
+          text: ${{ fromJson(steps.release-please.outputs.pr).title }}
+          regex: '(?<=\s)(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$'
+        if: ${{ steps.release-please.outputs.pr != '' }}
+
+
+      # --- Checkout the git repo
+      # Remembed to do this AFTER release please
       - name: Check Out Git Repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
 
-      # --- Bump pack.toml version
-      # Get Latest tag
-      # TODO: Change to release please tag
-      - name: Get Latest tag
-        id: tag
-        uses: WyriHaximus/github-action-get-previous-tag@v1
-        if: ${{ steps.release-please.outputs.releases_created }}
-
-      - name: Bump version
+      # --- Bump version
+      # Now we should use the parsed release to bump the version on the files on the release please branch
+      - name: Bump Version
         uses: ./.github/actions/bump-pack
         with:
-          release-tag: ${{ steps.tag.outputs.tag }}
+          release-tag: ${{ steps.version.outputs.match }}
           modpack: ${{ matrix.modpack }}
-        if: ${{ steps.release-please.outputs.releases_created }}
+          branch: ${{ fromJson(steps.release-please.outputs.pr).headBranchName }}
+        if: ${{ steps.release-please.outputs.pr != '' }}
 
 
-      # --- Handle the configs
+      # --- Get latest tag
+      # Should probably be switched to use the release please tag but whatever
+      - name: Get Latest tag
+        id: tag
+        uses: WyriHaximus/github-action-get-previous-tag@v1
+        if: ${{ steps.release-please.outputs.releases_created }}
 
-      - name: Parse pack file
+      # --- Handle the configs
+      - name: Parse Pack File
         id: parse
         uses: ./.github/actions/parse
         with:
           modpack: ${{ matrix.modpack }}
         if: ${{ steps.release-please.outputs.releases_created }}
 
-      - name: Set mod vendors
+      - name: Set Mod Vendors
         id: set-mod-vendors
         run: |
           [[ ! -z "${{ secrets.CURSEFORGE_TOKEN }}" && ! -z "${{ secrets.CURSEFORGE_ID }}" ]] && echo "curseforge=true" >> $GITHUB_OUTPUT || echo "curseforge=false" >> $GITHUB_OUTPUT
@@ -135,8 +156,7 @@ jobs:
 
 
       # --- Build an release
-
-      - name: Build modpack
+      - name: Build Modpack
         uses: ./.github/actions/build
         with:
           modpack: ${{ matrix.modpack }}
@@ -145,7 +165,9 @@ jobs:
           build-curse: ${{ env.default-release-curseforge }}
         if: ${{ steps.release-please.outputs.releases_created }}
 
-      - name: Release modpack to vendors
+
+      # --- Release
+      - name: Release Modpack to Vendors
         uses: ./.github/actions/release
         with:
           modpack: ${{ matrix.modpack }}