Skip to content

Commit d622dbc

Browse files
authored
build: pin mc-image-helper version for Java 8 (#3491)
1 parent 0ad97c2 commit d622dbc

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

.github/workflows/build-multiarch.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,26 @@ jobs:
7979
baseImage: eclipse-temurin:8u312-b07-jre-focal
8080
platforms: linux/amd64,linux/arm/v7,linux/arm64
8181
mcVersion: 1.12.2
82+
# Pin version for Java 8
83+
mcHelperVersion: 1.42.1
8284
- variant: java8-graalvm-ce
8385
baseImage: ghcr.io/graalvm/graalvm-ce:java8
8486
platforms: linux/amd64
8587
mcVersion: 1.12.2
88+
# Pin version for Java 8
89+
mcHelperVersion: 1.42.1
8690
- variant: java8-jdk
8791
baseImage: eclipse-temurin:8u312-b07-jdk-focal
8892
platforms: linux/amd64,linux/arm64
8993
mcVersion: 1.12.2
94+
# Pin version for Java 8
95+
mcHelperVersion: 1.42.1
9096
- variant: java8-openj9
9197
baseImage: ibm-semeru-runtimes:open-8u312-b07-jre
9298
platforms: linux/amd64,linux/arm64
9399
mcVersion: 1.12.2
100+
# Pin version for Java 8
101+
mcHelperVersion: 1.42.1
94102
env:
95103
IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}"
96104
HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }}
@@ -152,6 +160,7 @@ jobs:
152160
push: false
153161
build-args: |
154162
BASE_IMAGE=${{ matrix.baseImage }}
163+
${{ matrix.mcHelperVersion && format('MC_HELPER_VERSION={0}', matrix.mcHelperVersion) }}
155164
cache-from: type=gha,scope=${{ matrix.variant }}
156165
# no cache-to to avoid cross-cache update from next build step
157166

@@ -206,5 +215,6 @@ jobs:
206215
BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
207216
VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
208217
REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
218+
${{ matrix.mcHelperVersion && format('MC_HELPER_VERSION={0}', matrix.mcHelperVersion) }}
209219
cache-from: type=gha,scope=${{ matrix.variant }}
210220
cache-to: type=gha,mode=max,scope=${{ matrix.variant }}

.github/workflows/verify-pr.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
baseImage: eclipse-temurin:8u312-b07-jre-focal
4343
platforms: linux/amd64
4444
mcVersion: 1.12.2
45+
# Pin version for Java 8
46+
mcHelperVersion: 1.42.1
4547
env:
4648
IMAGE_TO_TEST: ${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}
4749
runs-on: ubuntu-22.04
@@ -63,6 +65,7 @@ jobs:
6365
pull: true
6466
build-args: |
6567
BASE_IMAGE=${{ matrix.baseImage }}
68+
${{ matrix.mcHelperVersion && format('MC_HELPER_VERSION={0}', matrix.mcHelperVersion) }}
6669
cache-from: type=gha,scope=${{ matrix.variant }}
6770

6871
- name: Build for test
@@ -79,6 +82,7 @@ jobs:
7982
push: false
8083
build-args: |
8184
BASE_IMAGE=${{ matrix.baseImage }}
85+
${{ matrix.mcHelperVersion && format('MC_HELPER_VERSION={0}', matrix.mcHelperVersion) }}
8286
cache-from: type=gha,scope=${{ matrix.variant }}
8387

8488
- name: Run tests

0 commit comments

Comments
 (0)