From 7411392cfecc2eea99e2dce36c8eefa441be49d6 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 11 Apr 2023 14:40:03 -0400
Subject: [PATCH 1/3] finalize docker mod builder don't require PRs to be made
 to the live branch, build and push all PRs (new mods' workflow info won't
 match the live values) PRs will be tagged just with the pr number and a
 prepend (without the mod name) Remove event info dumping

---
 .github/workflows/docker-mod-builder.yml | 37 +++++++-----------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/docker-mod-builder.yml b/.github/workflows/docker-mod-builder.yml
index 6007e18..7ad451f 100644
--- a/.github/workflows/docker-mod-builder.yml
+++ b/.github/workflows/docker-mod-builder.yml
@@ -42,12 +42,6 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
-      - name: Dump payload
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: |
-          echo "$GITHUB_CONTEXT"
-
       - name: Set Vars
         run: |
           echo "BASEIMAGE=${{ inputs.BASEIMAGE }}" >> $GITHUB_ENV
@@ -56,17 +50,6 @@ jobs:
           echo "GITHUB_REPO=${{ inputs.GITHUB_REPO }}" >> $GITHUB_ENV
           echo "MOD_VERSION=${{ inputs.MOD_VERSION }}" >> $GITHUB_ENV
 
-      - name: Dump vars
-        run: |
-          echo "BASEIMAGE is ${BASEIMAGE}"
-          echo "GITHUB_REPO is ${GITHUB_REPO}"
-          echo "MODNAME is ${MODNAME}"
-          echo "ENDPOINT is ${ENDPOINT}"
-          echo "MOD_VERSION is ${MOD_VERSION}"
-          echo "github.repository is ${{ github.repository }}"
-          echo "github.event.pull_request.base.ref is ${{ github.event.pull_request.base.ref }}"
-          echo "github.event.pull_request.base.repo.name is ${{ github.event.pull_request.base.repo.name }}"
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -89,13 +72,13 @@ jobs:
           fi
 
       - name: Tag image (PR)
-        if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
+        if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
         run: |
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
+          docker tag ${{ github.sha }} ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
+          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
 
       - name: Credential check
-        if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
+        if: ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }}
         run: |
           echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
           echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
@@ -109,7 +92,7 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.CR_USER && env.CR_PAT }}
+        if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.CR_USER && env.CR_PAT }}
         run: |
           echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
 
@@ -124,12 +107,12 @@ jobs:
           fi
 
       - name: Push tags to GitHub Container Registry (PR)
-        if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }}
+        if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }}
         run: |
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
+          docker push ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}
 
       - name: Login to DockerHub
-        if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.DOCKERUSER && env.DOCKERPASS }}
+        if: ${{ (github.event_name == 'push' && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name)) && env.DOCKERUSER && env.DOCKERPASS }}
         run: |
           echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
 
@@ -144,6 +127,6 @@ jobs:
           fi
 
       - name: Push tags to DockerHub (PR)
-        if: ${{ github.event.pull_request.base.ref == format('{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }}
+        if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }}
         run: |
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-pull_request_${{ github.event.pull_request.number }}
+          docker push ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}

From f3577570f1caa93d82e812eeb8298fcb13177af0 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:10:48 -0400
Subject: [PATCH 2/3] check out PR ref in permissions check

---
 .github/workflows/init-svc-executable-permissions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/init-svc-executable-permissions.yml b/.github/workflows/init-svc-executable-permissions.yml
index 50fdc27..410f9d5 100644
--- a/.github/workflows/init-svc-executable-permissions.yml
+++ b/.github/workflows/init-svc-executable-permissions.yml
@@ -8,7 +8,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3.5.0
         with:
-          fetch-depth: '0'
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: Check Permissions
         run: |
           WRONG_PERM=$(find ./  -path "./.git" -prune -o \( -name "run" -o -name "service" -o -name "check" \) -not -perm -u=x,g=x,o=x -print)

From 037dd71a0f089407c0446c8ffebd38cbba904392 Mon Sep 17 00:00:00 2001
From: aptalca <541623+aptalca@users.noreply.github.com>
Date: Tue, 11 Apr 2023 17:00:23 -0400
Subject: [PATCH 3/3] fix typo in perms workflow

---
 .github/workflows/init-svc-executable-permissions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/init-svc-executable-permissions.yml b/.github/workflows/init-svc-executable-permissions.yml
index 410f9d5..9527e57 100644
--- a/.github/workflows/init-svc-executable-permissions.yml
+++ b/.github/workflows/init-svc-executable-permissions.yml
@@ -11,7 +11,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Check Permissions
         run: |
-          WRONG_PERM=$(find ./  -path "./.git" -prune -o \( -name "run" -o -name "service" -o -name "check" \) -not -perm -u=x,g=x,o=x -print)
+          WRONG_PERM=$(find ./  -path "./.git" -prune -o \( -name "run" -o -name "finish" -o -name "check" \) -not -perm -u=x,g=x,o=x -print)
           if [ -n "${WRONG_PERM}" ]; then
             for i in ${WRONG_PERM}; do
               echo "::error file=${i},line=1,title=Missing Executable Bit::This file needs to be set as executable!"