Skip to content

Commit ff3b194

Browse files
authored
WinPB: Add Wix Installer Additional Utilities. (adoptium#4242)
* WindowsPB: Update Cygwin Installer Checksum * WindowsPB: Add WiX extensions
1 parent 7ee7aed commit ff3b194

File tree

2 files changed

+12
-1
lines changed
  • ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles

2 files changed

+12
-1
lines changed

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/WiX/tasks/main.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@
5656
when: (not wix_installed.stat.exists) or (installed_wix_version.stdout.find(wix_version) == -1)
5757
tags: Wix
5858

59+
# Add WiX extensions for jpackage tests
60+
- name: Add WiX extensions
61+
ansible.windows.win_shell: |
62+
wix extension add -g WixToolset.Util.wixext/{{ wix_version }}
63+
wix extension add -g WixToolset.Ui.wixext/{{ wix_version }}
64+
register: wixext_add
65+
failed_when: >
66+
wixext_add.rc != 0 and
67+
(wixext_add.stdout + wixext_add.stderr) is not search("already installed")
68+
tags: Wix
69+
5970
- name: Delete downloaded .NET installer
6071
win_file:
6172
path: 'C:\temp\dotnet-install.exe'

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
url: "https://cygwin.com/setup-x86_64.exe"
2424
dest: "C:\\temp\\cygwin.exe"
2525
force: no
26-
checksum: "46993d76d756bde18564f72a4ee07384cd82b447527ca406c8bfc034cb05c664"
26+
checksum: "4175dfeb4c5c44d2a53596081f73eac962d648901199a841509b594cca831396"
2727
checksum_algorithm: sha256
2828
when: not cygwin_installed.stat.exists
2929
register: cygwin_download

0 commit comments

Comments
 (0)