refactor: streamline vars + remove dead code (fix #2)

Author: mpsq

.github/workflows/build.yml

@@ -10,8 +10,10 @@ on:
         required: true
 
 env:
-  SELF_GH: https://api.github.com/repos/mpsq/emacs-gcc-wayland-devel-builder
-  UPSTREAM_GH: https://api.github.com/repos/flatwhatson/emacs
+  UPSTREAM_API: https://api.github.com/repos/flatwhatson/emacs
+  UPSTREAM_BRANCH: pgtk-nativecomp
+  UPSTREAM_REPO: https://github.com/flatwhatson/emacs
+  UPSTREAM_SRC: https://raw.githubusercontent.com/flatwhatson/emacs/pgtk-nativecomp
 
 jobs:
   check:
@@ -28,7 +30,7 @@ jobs:
         id: var
         run: . ./ci/set-env-vars.bash
     outputs:
-      ver: ${{ steps.var.outputs.ver }}
+      pkg_version: ${{ steps.var.outputs.pkg_version }}
 
   artifact:
     runs-on: ubuntu-20.04
@@ -39,7 +41,7 @@ jobs:
     env:
       OLD_COMMIT_N: ${{ github.event.inputs.old_commit_n }}
       NEW_COMMIT_N: ${{ github.event.inputs.new_commit_n }}
-      PKG_VERSION: ${{ needs.check.outputs.ver }}
+      PKG_VERSION: ${{ needs.check.outputs.pkg_version }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v2
@@ -53,8 +55,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ needs.check.outputs.ver }}
-          release_name: Release ${{ needs.check.outputs.ver }}
+          tag_name: ${{ needs.check.outputs.pkg_version }}
+          release_name: Release ${{ needs.check.outputs.pkg_version }}
           body_path: /home/pcr/body.md
           draft: false
           prerelease: false
@@ -65,8 +67,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /home/pcr/${{ needs.check.outputs.ver }}.tar.gz
-          asset_name: ${{ needs.check.outputs.ver }}.tar.gz
+          asset_path: /home/pcr/${{ needs.check.outputs.pkg_version }}.tar.gz
+          asset_name: ${{ needs.check.outputs.pkg_version }}.tar.gz
           asset_content_type: application/gzip
       - name: Push to AUR
         env:

ci/build-artifacts.bash

@@ -21,10 +21,10 @@ tar czf "$PKG_VERSION".tar.gz -C out .
 # Get release body
 delta=$(echo "$NEW_COMMIT_N - $OLD_COMMIT_N" | bc)
 echo -en "# Commits since last release\n\n" > body.md
-echo -en "Check [upstream](https://github.com/flatwhatson/emacs/commits) for the full history.\n\n" >> body.md
+echo -en "Check [upstream]("$UPSTREAM_REPO"/commits) for the full history.\n\n" >> body.md
 
 # Get the list of commits since last release
-curl -s "$UPSTREAM_GH"/commits?per_page="$delta" | \
+curl -s "$UPSTREAM_API"/commits?per_page="$delta" | \
   # Parse and retain only the commit message + its url
   jq -r '.[] | (.commit.message | capture("(?<id>.+)\n").id) + " [commit](" + .html_url + ")"' | \
   # Remove "Merge" commits

ci/set-env-vars.bash

@@ -2,10 +2,14 @@
 
 set -euxo pipefail
 
-VER=$(curl -s https://raw.githubusercontent.com/flatwhatson/emacs/pgtk-nativecomp/configure.ac | grep AC_INIT | sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')
-VER+="."
-VER+="$NEW_COMMIT_N"
+PKG_VERSION=$(
+  curl -s "$UPSTREAM_SRC"/configure.ac | \
+    grep AC_INIT | \
+    sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/'
+)
+PKG_VERSION+="."
+PKG_VERSION+="$NEW_COMMIT_N"
 
-export VER="${VER}"
+export PKG_VERSION="${PKG_VERSION}"
 
-echo "::set-output name=ver::${VER}"
+echo "::set-output name=pkg_version::${PKG_VERSION}"

pull.bash

@@ -3,8 +3,8 @@
 if [[ -d "emacs" ]]; then
   cd emacs
   git checkout .
-  git pull --rebase origin pgtk-nativecomp
+  git pull --rebase origin "$UPSTREAM_BRANCH"
 else
-  git clone --depth=1 https://github.com/flatwhatson/emacs
+  git clone --depth=1 "$UPSTREAM_REPO"
   cd emacs
 fi