feat: add "pkg_rel" in release number

Author: mpsq

.github/workflows/build.yml

@@ -18,13 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       pkg_version: ${{ steps.var.outputs.pkg_version }}
+      pkg_rel: ${{ steps.var.outputs.pkg_rel }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v3
 
-      - name: Check last version
-        run: bash ./scripts/check-last-version.bash
-
       - name: Import environment variables
         shell: bash
         run: |
@@ -36,12 +34,16 @@ jobs:
         id: var
         run: . ./scripts/set-env-vars.bash
 
+      - name: Check last version
+        run: bash ./scripts/check-last-version.bash
+
   artifact:
     runs-on: ubuntu-latest
     needs: check
     container: mpsq/emacs-builder:latest
     env:
       PKG_VERSION: ${{ needs.check.outputs.pkg_version }}
+      PKG_REL: ${{ needs.check.outputs.pkg_rel }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v3
@@ -58,9 +60,9 @@ jobs:
 
       - uses: ncipollo/release-action@v1
         with:
-          tag: ${{ needs.check.outputs.pkg_version }}
+          tag: ${{ needs.check.outputs.pkg_version }}-${{ needs.check.outputs.pkg_rel }}
           bodyFile: ${{ env.USR_HOME }}/body.md
-          name: Release ${{ needs.check.outputs.pkg_version }}
+          name: Release ${{ needs.check.outputs.pkg_version }}-${{ needs.check.outputs.pkg_rel }}
           artifactContentType: application/gzip
           artifacts: ${{ env.USR_HOME }}/${{ needs.check.outputs.pkg_version }}.tar.gz
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manual.yml

@@ -8,23 +8,29 @@ on:
       old_commit_n:
         description: "Commit # for upstream"
         required: true
+      release:
+        description: "Wether or not to create a new release"
+        required: true 
+        type: boolean 
+      pkg_rel:
+        description: "Package release #"
+        required: true
 
 env:
   OLD_COMMIT_N: ${{ github.event.inputs.old_commit_n }}
   NEW_COMMIT_N: ${{ github.event.inputs.new_commit_n }}
+  I_PKG_REL: ${{ github.event.inputs.pkg_rel }}
 
 jobs:
   check:
     runs-on: ubuntu-latest
     outputs:
       pkg_version: ${{ steps.var.outputs.pkg_version }}
+      pkg_rel: ${{ steps.var.outputs.pkg_rel }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v3
 
-      - name: Check last version
-        run: bash ./scripts/check-last-version.bash
-
       - name: Import environment variables
         shell: bash
         run: |
@@ -36,12 +42,17 @@ jobs:
         id: var
         run: . ./scripts/set-env-vars.bash
 
+      - name: Check last version
+        if: ${{ inputs.release }}
+        run: bash ./scripts/check-last-version.bash
+
   artifact:
     runs-on: ubuntu-latest
     needs: check
     container: mpsq/emacs-builder:latest
     env:
       PKG_VERSION: ${{ needs.check.outputs.pkg_version }}
+      PKG_REL: ${{ needs.check.outputs.pkg_rel }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v3
@@ -65,3 +76,20 @@ jobs:
           name: emacs-manual-build
           path: ${{ env.USR_HOME }}/${{ needs.check.outputs.pkg_version }}.tar.gz
           retention-days: 5
+
+      - uses: ncipollo/release-action@v1
+        if: ${{ inputs.release }}
+        with:
+          tag: ${{ needs.check.outputs.pkg_version }}-${{ needs.check.outputs.pkg_rel }}
+          bodyFile: ${{ env.USR_HOME }}/body.md
+          name: Release ${{ needs.check.outputs.pkg_version }}-${{ needs.check.outputs.pkg_rel }}
+          artifactContentType: application/gzip
+          artifacts: ${{ env.USR_HOME }}/${{ needs.check.outputs.pkg_version }}.tar.gz
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push to AUR
+        if: ${{ inputs.release }}
+        env:
+          PRIV_KEY: ${{ secrets.PRIV_KEY }}
+          PUB_KEY: ${{ secrets.PUB_KEY }}
+        run: bash ./scripts/push-to-aur.bash

assets/variables

@@ -3,7 +3,6 @@ AUR_IP=95.216.144.15
 AUR_PKG=emacs-gcc-wayland-devel-bin
 USR=pcr
 USR_HOME=/home/pcr
-PKG_REL=1
 UPSTREAM_API=https://api.github.com/repos/flatwhatson/emacs
 UPSTREAM_BRANCH=pgtk-nativecomp-dev
 UPSTREAM_REPO=https://github.com/flatwhatson/emacs

scripts/build-artifacts.bash

@@ -27,6 +27,11 @@ rm emacs-1-1-x86_64.pkg.tar.zst
 rm out/.BUILDINFO out/.MTREE out/.PKGINFO
 tar czf "$PKG_VERSION".tar.gz -C out .
 
+if [[ "$NEW_COMMIT_N" == "$OLD_COMMIT_N" ]]; then
+  touch body.md
+  exit 0
+fi
+
 # Get release body
 delta=$(echo "$NEW_COMMIT_N - $OLD_COMMIT_N" | bc)
 echo -en "# Commits since last release\n\n" >body.md

scripts/check-last-version.bash

@@ -2,5 +2,8 @@
 
 set -euxo pipefail
 
-# Check if a new release is needed
-if [ "$OLD_COMMIT_N" == "$NEW_COMMIT_N" ]; then exit 1; else exit 0; fi
+status_code=$(curl -s -o "/dev/null" -w "%{http_code}" "https://api.github.com/repos/mpsq/emacs-gcc-wayland-devel-builder/releases/tags/$NEW_COMMIT_N-$PKG_REL")
+
+if [[ "$status_code" == "200" ]]; then
+  exit 1
+fi

scripts/set-env-vars.bash

@@ -14,4 +14,11 @@ PKG_VERSION+="$NEW_COMMIT_N"
 
 # Export to env var + github action var
 export PKG_VERSION="${PKG_VERSION}"
-echo "pkg_version=$PKG_VERSION" >> $GITHUB_OUTPUT
+echo "pkg_version=$PKG_VERSION" >> $GITHUB_OUTPUT
+
+pkgrel="1"
+if [[ -v I_PKG_REL ]]; then
+  pkgrel="$I_PKG_REL"
+fi
+export PKG_REL="${pkgrel}"
+echo "pkg_rel=$pkgrel" >> $GITHUB_OUTPUT