From a6e597989db940841442f1ed5389cf2b6074b6e0 Mon Sep 17 00:00:00 2001 From: Tristan Date: Sat, 11 Jan 2025 15:47:10 +0000 Subject: [PATCH] Ensure checkout happens before trying to run the local action oops --- .github/actions/maven-build/action.yml | 2 -- .github/workflows/ci.yml | 16 +++++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/actions/maven-build/action.yml b/.github/actions/maven-build/action.yml index e4bc03a..3859f6c 100644 --- a/.github/actions/maven-build/action.yml +++ b/.github/actions/maven-build/action.yml @@ -11,8 +11,6 @@ inputs: runs: using: composite steps: - - name: "Checkout repository" - uses: "actions/checkout@v4" - name: "Cache local Maven repository" uses: "actions/cache@v4" with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77c08dd..e774637 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ jobs: runs-on: "ubuntu-latest" outputs: build_version: "${{ steps.set_variables.outputs.build_version }}" - java_version: "${{ steps.set_variables.outputs.java_version }}" - docker_image: "${{ steps.set_variables.outputs.docker_image }}" + java_version: "${{ steps.set_variables.outputs.java_version }}" + docker_image: "${{ steps.set_variables.outputs.docker_image }}" steps: - id: "set_variables" run: | @@ -34,10 +34,14 @@ jobs: name: "HotSpot" runs-on: "ubuntu-latest" needs: [ "set_variables" ] - container: - image: "ghcr.io/mangadex-pub/jdk-maven:${{ needs.set_variables.outputs.java_version }}-corretto" - options: "--user root" steps: + - name: "Checkout repository" + uses: "actions/checkout@v4" + - name: "Install JDK" + uses: "actions/setup-java@4" + with: + distribution: "corretto" + java-version: "${{ needs.set_variables.outputs.java_version }}" - name: "Maven Build (JIT)" uses: "./.github/actions/maven-build" with: @@ -57,6 +61,8 @@ jobs: image: "ghcr.io/mangadex-pub/jdk-maven:${{ needs.set_variables.outputs.java_version }}-graal" options: "--user root" steps: + - name: "Checkout repository" + uses: "actions/checkout@v4" - name: "Maven Build (AOT)" uses: "./.github/actions/maven-build" with: