Skip to content

Commit 7351acf

Browse files
committed
Use set-variables set since GHCI has strange context access rules on stuff like job.*.container
1 parent d5aca76 commit 7351acf

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,30 @@ jobs:
1313
name: "Set build variables"
1414
runs-on: "ubuntu-latest"
1515
outputs:
16-
build_image: "${{ steps.build_variables.outputs.build_image }}"
1716
build_version: "${{ steps.build_variables.outputs.build_version }}"
17+
java_version: "${{ steps.build_variables.outputs.java_version }}"
18+
docker_image: "${{ steps.build_variables.outputs.docker_image }}"
1819
steps:
1920
- id: "build_variables"
2021
run: |
2122
set -euo pipefail
22-
BUILD_IMAGE="$(echo "ghcr.io/$GITHUB_REPOSITORY" | tr '[:upper:]' '[:lower:]')"
23-
BUILD_VERSION="git-$(date +'%Y%m%d%H%M')-$(echo "$GITHUB_SHA" | head -c 7)"
24-
echo "build_image=$BUILD_IMAGE" | tee -a "$GITHUB_OUTPUT"
23+
24+
echo "Setting workflow variables..."
25+
26+
BUILD_VERSION="jdk-${{ env.JAVA_VERSION }}.git-$(echo "$GITHUB_SHA" | head -c 7).build-$(date +'%Y%m%d%H%M')"
2527
echo "build_version=$BUILD_VERSION" | tee -a "$GITHUB_OUTPUT"
28+
JAVA_VERSION="$(echo "${{ env.JAVA_VERSION }}" | grep -E "^[0-9]+$")"
29+
echo "java_version=$JAVA_VERSION" | tee -a "$GITHUB_OUTPUT"
30+
DOCKER_IMAGE="$(echo "ghcr.io/$GITHUB_REPOSITORY" | tr '[:upper:]' '[:lower:]')"
31+
echo "docker_image=$DOCKER_IMAGE" | tee -a "$GITHUB_OUTPUT"
2632
2733
build_hotspot:
2834
name: "HotSpot"
2935
runs-on: "ubuntu-latest"
3036
needs: [ "set_variables" ]
3137
container:
32-
image: "ghcr.io/mangadex-pub/jdk-maven:${{ env.JAVA_VERSION }}-corretto"
33-
options: "--user root" # this is sad, but Github CI is (once again) very silly
38+
image: "ghcr.io/mangadex-pub/jdk-maven:${{ needs.build_variables.outputs.java_version }}-corretto"
39+
options: "--user root"
3440
steps:
3541
- name: "Maven Build (JIT)"
3642
uses: "./.github/actions/maven-build.yml"
@@ -48,8 +54,8 @@ jobs:
4854
runs-on: "ubuntu-latest"
4955
needs: [ "set_variables", "build_hotspot" ]
5056
container:
51-
image: "ghcr.io/mangadex-pub/jdk-maven:${{ env.JAVA_VERSION }}-graal"
52-
options: "--user root" # this is sad, but Github CI is (once again) very silly
57+
image: "ghcr.io/mangadex-pub/jdk-maven:${{ needs.build_variables.outputs.java_version }}-graal"
58+
options: "--user root"
5359
steps:
5460
- name: "Maven Build (AOT)"
5561
uses: "./.github/actions/maven-build.yml"

0 commit comments

Comments
 (0)