build: perform validation on all base images for PRs (#1610)

.github/FUNDING.yml

@@ -1,5 +1,4 @@
-
-#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: itzg
 custom:
   - https://www.buymeacoffee.com/itzg
   - https://paypal.me/itzg

.github/workflows/build-multiarch.yml

@@ -1,4 +1,4 @@
-name: Build and publish multiarch
+name: Test and Build multi-architecture
 on:
   push:
     branches:
@@ -10,6 +10,13 @@ on:
       - "*.md"
       - "docs/**"
       - "examples/**"
+  pull_request:
+    branches: [ master ]
+    types: [assigned, opened, synchronize, labeled]
+    paths-ignore:
+      - "*.md"
+      - "docs/**"
+      - "examples/**"
 
 jobs:
   build:
@@ -120,12 +127,6 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2.0.0
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
       - name: Build for test
         uses: docker/build-push-action@v3.0.0
         with:
@@ -149,12 +150,23 @@ jobs:
         run: |
           tests/test.sh
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v3.0.0
         with:
           platforms: ${{ matrix.platforms }}
-          push: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+          push: >
+            ${{ 
+            github.ref_type == 'tag' 
+            || github.ref_name == 'master' 
+            || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'ci/push-image') )
+            }}
           tags: ${{ steps.meta.outputs.tags }}
           # ensure latest base image is used
           pull: true

.github/workflows/pr.yml

@@ -1,73 +0,0 @@
-name: PullRequest
-
-on:
-  pull_request:
-    branches: [ master ]
-    types: [assigned, opened, synchronize, labeled]
-    paths-ignore:
-      - "*.md"
-      - "docs/**"
-      - "examples/**"
-
-env:
-  IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: .
-          platforms: linux/amd64
-          tags: ${{ env.IMAGE_TO_TEST }}
-          load: true
-          cache-from: type=gha
-
-      - name: Run tests
-        env:
-          MODS_FORGEAPI_KEY: ${{ secrets.MODS_FORGEAPI_KEY }}
-          MINECRAFT_VERSION: 1.18.2
-        run: |
-          tests/test.sh
-  push:
-    runs-on: ubuntu-20.04
-    needs:
-      - test
-    if: contains(github.event.pull_request.labels.*.name, 'ci/push-image')
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Gather Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            itzg/minecraft-server
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Push
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: .
-          platforms: linux/amd64
-          tags: ${{ steps.meta.outputs.tags }}
-          pull: true
-          push: true
-          cache-from: type=gha
-          labels: ${{ steps.meta.outputs.labels }}