Merge branch 'master' into test_image

adoptium · Oct 10, 2024 · 878870c · 878870c
2 parents b4f047c + 9ced499
commit 878870c
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/.github/workflows/build_test_containers.yml b/.github/workflows/build_test_containers.yml
@@ -32,18 +32,18 @@ jobs:
 
             # Get list of changed files in ansible/docker/test/Dockerfile*
             - name: Get list of changed Dockerfiles
-              id: get_changed_files
               run: |
                 if [ ${{ github.event_name }} == "push" ]; then
                     changed_files=$(git diff --name-only HEAD~1 | grep ansible/docker/test/Dockerfile || true)
                 else
                     changed_files=$(git diff --name-only origin/master | grep ansible/docker/test/Dockerfile || true)
                 fi
+                echo $changed_files
                 echo "changed_files=$changed_files" >> "$GITHUB_ENV"
 
             # Generate matrix
             - name: Generate matrix
-              if: steps.get_changed_files.outputs.changed_files
+              if: ${{ env.changed_files != '' }}
               id: generate_matrix
               run: |
                 matrix=$(jq -n --arg files "${changed_files}" '{

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml
@@ -76,6 +76,8 @@
       tags: MSVS_2019
     - role: MSVS_2022
       tags: MSVS_2022
+    - role: MSVS_2022_REDIST
+      tags: MSVS_2022_REDIST
     - NVidia_Cuda_Toolkit         # OpenJ9
     - NTP_TIME
     - Clang_64bit                 # OpenJ9

diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/MSVS_2022_REDIST/tasks/main.yml
@@ -0,0 +1,56 @@
+---
+###########################################
+# Visual Studio 2022 Redists Installation #
+###########################################
+- name: Set Windows SDK version
+  set_fact:
+    wsdk_version: "14.40.33807_10.0.26100.0"
+  tags: MSVS_2022_REDIST
+
+- name: Set Windows SDK checksum
+  set_fact:
+    wsdk_checksum: "a29ada15d941a7b2065e9a4273fd6b97df44d089ed2b9f860ded442f7fe69767"
+  tags: MSVS_2022_REDIST
+
+- name: Test if VS 2022 Redists Are installed
+  win_stat:
+    path: 'c:\openjdk\devkit\vs2022_redist_{{ wsdk_version }}'
+  register: vs2022sdk_installed
+  tags: MSVS_2022_REDIST
+
+- name: Check if C:\openjdk\devkit exists
+  ansible.windows.win_stat:
+    path: 'c:\openjdk\devkit'
+  register: directory_status
+  tags: MSVS_2022_REDIST
+
+- name: Create  C:\openjdk\devkit if it does not exist
+  ansible.windows.win_file:
+    path: 'c:\openjdk\devkit\'
+    state: directory
+  when: not directory_status.stat.exists
+  tags: MSVS_2022_REDIST
+
+# Download & Install VS2022 Redists From Github
+
+- name: Download Visual Studio 2022 Redists
+  win_get_url:
+    url: 'https://github.com/adoptium/devkit-binaries/releases/download/vs2022_redist_14.40.33807_10.0.26100.0/vs2022_redist_14.40.33807_10.0.26100.0.zip'
+    checksum: "{{ wsdk_checksum }}"
+    checksum_algorithm: sha256
+    dest: 'c:\openjdk\devkit\vs2022_redist_{{ wsdk_version }}.zip'
+    force: no
+  tags: MSVS_2022_REDIST
+
+- name: Unzip Visual Studio 2022 Redists
+  win_unzip:
+    src: 'c:\openjdk\devkit\vs2022_redist_{{ wsdk_version }}.zip'
+    dest: 'c:\openjdk\devkit\vs2022_redist_{{ wsdk_version }}'
+  when: not vs2022sdk_installed.stat.exists
+  tags: MSVS_2022_REDIST
+
+- name: Remove VS2022 redists Download
+  win_file:
+    path: 'c:\openjdk\devkit\vs2022_redist_{{ wsdk_version }}.zip'
+    state: absent
+  tags: MSVS_2022_REDIST