update docker image to pull to be 6.1.2 based

Author: ktoso

.github/actions/prepare_env/action.yml

@@ -15,7 +15,7 @@ runs:
         path: /usr/lib/jvm/default-jdk/
         key: ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}-${{ hashFiles('/usr/lib/jvm/default-jdk/*') }}
         restore-keys: |
-          ${{ runner.os }}-jdk-
+          ${{ runner.os }}-jdk-${{ matrix.jdk_vendor }}
     - name: Install JDK
       if: steps.cache-jdk.outputs.cache-hit != 'true'
       run: "bash -xc 'JDK_VENDOR=${{ matrix.jdk_vendor }} ./docker/install_jdk.sh'"

.github/workflows/pull_request.yml

@@ -20,8 +20,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -46,8 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -70,8 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -90,8 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -110,8 +106,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -130,8 +125,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -150,8 +144,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:
@@ -170,8 +163,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # swift_version: ['nightly-main']
-        swift_version: ['6.0.2']
+        swift_version: ['6.1.2']
         os_version: ['jammy']
         jdk_vendor: ['Corretto']
     container:

docker/install_jdk.sh

@@ -53,7 +53,7 @@ download_and_install_jdk() {
             case "$jdk_version" in
                 "21")
                     jdk_url="https://corretto.aws/downloads/latest/amazon-corretto-21-x64-linux-jdk.tar.gz"
-                    expected_md5="84368821f590bd58708d9e350534c7f8"
+                    expected_md5="a123e7f50807c27de521bef7378d3377"
                     ;;
                 "24")
                     jdk_url="https://corretto.aws/downloads/latest/amazon-corretto-24-x64-linux-jdk.tar.gz"