Revert "Setup java home using already setup java versions on the runn…

…ers" This reverts commit 2c6a089.
utopia-rise · Oct 12, 2024 · 4d5092f · 4d5092f
1 parent 95652e1
commit 4d5092f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 58 deletions.
diff --git a/.github/actions/setup-java-home/action.yml b/.github/actions/setup-java-home/action.yml
diff --git a/.github/workflows/assemble_android.yml b/.github/workflows/assemble_android.yml
@@ -36,10 +36,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Setup JAVA_HOME
-        uses: ./modules/kotlin_jvm/.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps

diff --git a/.github/workflows/build_jvm.yml b/.github/workflows/build_jvm.yml
@@ -20,10 +20,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/deploy_create_draft_release.yml b/.github/workflows/deploy_create_draft_release.yml
@@ -13,10 +13,10 @@ jobs:
         with:
           fetch-depth: 0 # clone whole history -> needed for generation of changelog
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/deploy_jvm.yml b/.github/workflows/deploy_jvm.yml
@@ -37,10 +37,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Setup JAVA_HOME
-        uses: ./modules/kotlin_jvm/.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -114,10 +114,10 @@ jobs:
         with:
           path: modules/kotlin_jvm
 
-      - name: Setup JAVA_HOME
-        uses: ./modules/kotlin_jvm/.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_linux_exports.yml b/.github/workflows/test_linux_exports.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_macos_exports.yml b/.github/workflows/test_macos_exports.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

diff --git a/.github/workflows/test_windows_exports.yml b/.github/workflows/test_windows_exports.yml
@@ -31,10 +31,10 @@ jobs:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v4
 
-      - name: Setup JAVA_HOME
-        uses: ./.github/actions/setup-java-home
+      - uses: actions/setup-java@v4
         with:
-          version: ${{ inputs.jvm-version }}
+          distribution: temurin
+          java-version: ${{ inputs.jvm-version }}
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3