Reworking CI validation for samples to pass on linux

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/Dockerfile

@@ -1,6 +1,6 @@
 ARG swift_version=nightly-main
 ARG ubuntu_version=jammy
-ARG base_image=docker.io/swiftlang/swift:$swift_version-$ubuntu_version
+ARG base_image=docker.io/swiftlang/swift:${swift_version}-${ubuntu_version}
 FROM $base_image
 # needed to do again after FROM due to docker limitation
 ARG swift_version
@@ -18,12 +18,13 @@ ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8
 
-# JDK dependency
 COPY install_jdk.sh .
+COPY install_swiftly.sh .
+
+# JDK dependency
 RUN bash -xc 'JDK_VENDOR=Corretto ./install_jdk.sh'
 ENV JAVA_HOME="/usr/lib/jvm/default-jdk"
 ENV PATH="$PATH:/usr/lib/jvm/default-jdk/bin"
 
 # Install Swift with Swiftly
-COPY install_swiftly.sh .
-RUN bash -xc './install_swiftly.sh'
+# RUN bash -xc './install_swiftly.sh'

docker/install_jdk.sh

@@ -22,7 +22,7 @@ if [ "$JDK_VENDOR" = "" ]; then
 declare -r JDK_VENDOR="Corretto"
 fi
 
-apt-get update && apt-get install -y wget
+apt-get update && apt-get install -y wget tree
 
 echo "Download JDK for: $(uname -m)"
 
@@ -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"
@@ -94,20 +94,21 @@ download_and_install_jdk() {
 
     # Move extracted directory to a standard name
     local extracted_dir
-    extracted_dir="$(find . -maxdepth 1 -type d -name "*jdk*" | head -n1)"
-    if [ -n "$extracted_dir" ]; then
-        mv "$extracted_dir"/* .
-        rm -rf "$extracted_dir"
-    fi
+    extracted_dir="$(find . -maxdepth 1 -type d -name '*linux*' | head -n1)"
+    echo "move $extracted_dir to $(pwd)..."
+    mv "${extracted_dir}"/* .
 
     echo "JDK $jdk_version installed successfully in /usr/lib/jvm/jdk-${jdk_version}/"
-    cd
+    cd "$HOME"
 }
 
 # Usage: Install both JDK versions
 download_and_install_jdk "21"
 download_and_install_jdk "24"
 
-ln -sf /usr/lib/jvm/jdk-21 /usr/lib/jvm/default-jdk
+ls -la /usr/lib/jvm/
+cd /usr/lib/jvm/
+ln -s jdk-21 default-jdk
+find . | grep java | grep bin
 echo "JAVA_HOME = /usr/lib/jvm/default-jdk"
 /usr/lib/jvm/default-jdk/bin/java -version