amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-08-03 06:02:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix build workflow conditionals that always evaluated true (#4203)

Browse Source
This commit is contained in:
OowhitecatoO
2026-07-31 15:50:08 -05:00
committed by GitHub
parent 749f8f635f
commit 1e4602a82e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+6 -4
View File
@@ -104,6 +104,8 @@ jobs:
# Assume they line up, but when forked change to your Docker Hub username # Assume they line up, but when forked change to your Docker Hub username
DOCKER_HUB_ORG: ${{ github.repository_owner }} DOCKER_HUB_ORG: ${{ github.repository_owner }}
IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}" IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}"
# NOTE: env values are always strings, so the boolean-valued ones below have to be
# compared with == 'true'. Used bare, the string "false" evaluates as true.
HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }} HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }}
MAIN_VARIANT: java25 MAIN_VARIANT: java25
PUSH: ${{ github.repository_owner == 'itzg' }} PUSH: ${{ github.repository_owner == 'itzg' }}
@@ -179,14 +181,14 @@ jobs:
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v4.5.2 uses: docker/login-action@v4.5.2
if: env.HAS_IMAGE_REPO_ACCESS if: env.HAS_IMAGE_REPO_ACCESS == 'true'
with: with:
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GHCR - name: Login to GHCR
uses: docker/login-action@v4.5.2 uses: docker/login-action@v4.5.2
if: env.HAS_IMAGE_REPO_ACCESS if: env.HAS_IMAGE_REPO_ACCESS == 'true'
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}
@@ -199,13 +201,13 @@ jobs:
platforms: ${{ matrix.platforms }} platforms: ${{ matrix.platforms }}
push: > push: >
${{ ${{
env.PUSH && env.PUSH == 'true' &&
( (
github.ref_type == 'tag' github.ref_type == 'tag'
|| github.ref_name == github.event.repository.default_branch || github.ref_name == github.event.repository.default_branch
|| startsWith(github.ref_name, 'test/') || startsWith(github.ref_name, 'test/')
|| ( github.event_name == 'pull_request' || ( github.event_name == 'pull_request'
&& env.HAS_IMAGE_REPO_ACCESS && env.HAS_IMAGE_REPO_ACCESS == 'true'
&& contains(github.event.pull_request.labels.*.name, 'ci/push-image') && contains(github.event.pull_request.labels.*.name, 'ci/push-image')
) )
) )