Merge pull request #305 from membermatters/main

update dev with gha changes

Author: jabelone

.github/workflows/build_docker.pr.yml

@@ -12,24 +12,34 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       branch: ${{ steps.extract_branch.outputs.branch }}
+      repoowner: ${{ steps.extract_repo_owner.outputs.repoowner }}
+      imagename: ${{ steps.extract_image_name.outputs.imagename }}
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Extract branch name
         shell: bash
         run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" | tr / - >> $GITHUB_OUTPUT
         id: extract_branch
-      - name: Save PR number and branch name
+      - name: Extract repo owner
+        shell: bash
+        run: echo "repoowner=${{ github.repository_owner }}" | tr / - >> $GITHUB_OUTPUT
+        id: extract_repo_owner
+      - name: Generate image name
+        shell: bash
+        run: echo "imagename=membermatters/membermatters:untrusted-pr-image-${{steps.extract_repo_owner.outputs.repoowner}}-${{ steps.extract_branch.outputs.branch }}" | tr / - >> $GITHUB_OUTPUT
+        id: extract_image_name
+      - name: Save PR number and branch/image name
         run: |
           mkdir -p ./pr
           echo ${{ github.event.number }} > ./pr/prnumber
           echo ${{ steps.extract_branch.outputs.branch }} > ./pr/branchname
-          echo membermatters/membermatters:untrusted-pr-${{ steps.extract_branch.outputs.branch }} > ./pr/imagename
+          echo ${{ steps.extract_image_name.outputs.imagename }} > ./pr/imagename
       - name: Build pr image
         id: docker_build
         uses: docker/build-push-action@v6
         with:
-          tags: membermatters/membermatters:untrusted-pr-${{ steps.extract_branch.outputs.branch }}
+          tags: ${{ steps.extract_image_name.outputs.imagename }}
           outputs: type=docker,dest=./pr/untrusted-pr-image.tar
           file: docker/Dockerfile
           platforms: linux/amd64

.github/workflows/upload_docker.pr.yml

@@ -13,62 +13,53 @@ jobs:
       github.event.workflow_run.event == 'pull_request' &&
       github.event.workflow_run.conclusion == 'success'
     outputs:
-      imagename: ${{ steps.extract_image.outputs.imagename }}
+      imagename: ${{ steps.extract_image_name.outputs.imagename }}
     steps:
       - name: Download PR Image
         uses: actions/github-script@v7
         with:
           script: |
-            var artifacts = await github.actions.listWorkflowRunArtifacts({
+            var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
                owner: context.repo.owner,
                repo: context.repo.repo,
                run_id: ${{github.event.workflow_run.id }},
             });
             var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
               return artifact.name == "pr"
             })[0];
-            var download = await github.actions.downloadArtifact({
+            var download = await github.rest.actions.downloadArtifact({
                owner: context.repo.owner,
                repo: context.repo.repo,
                artifact_id: matchArtifact.id,
                archive_format: 'zip',
             });
             var fs = require('fs');
             fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
-      - run: ls -hal
       - name: Unzip PR Image
         run: |
           unzip pr.zip
-      - run: ls -hal
       - name: Check PR Metadata
         run: |
-          cat ./pr/prnumber
-          cat ./pr/branchname
-          cat ./pr/imagename
+          cat ./prnumber
+          cat ./branchname
+          cat ./imagename
       - name: Extract image name
         shell: bash
-        run: echo "imagename="$(cat test)"" | tr / - >> $GITHUB_OUTPUT
-        id: extract_image
+        run: echo "imagename="$(cat imagename)"" - >> $GITHUB_OUTPUT
+        id: extract_image_name
       - name: Load PR Image
         run: |
-          docker load --input ./pr/untrusted-pr-image.tar
+          docker load --input ./untrusted-pr-image.tar
           docker image ls -a
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and Push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: docker/Dockerfile
-          push: true
-          tags: ${{ steps.extract_image.outputs.imagename }}
-
+      - name: Push docker image to DockerHub
+        run: |
+          docker push ${{ steps.extract_image_name.outputs.imagename }}
   comment_docker_image:
     needs: upload-docker-pr
     runs-on: ubuntu-latest
@@ -82,5 +73,5 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body: 'Created image with name `${{ needs.upload-docker-pr.outputs.imagename }}`.'
+              body: 'Created image with name `${{ needs.upload-docker-pr.outputs.imagename }}`. WARNING: run this at your own risk - it is an untrusted PR.'
             })