Skip to content

Commit dd6d373

Browse files
committed
unixPB: improves Ant-Contrib role compatibility
It helps improve `Ant-Contrib` role by replacing wget with get_url module. Also when extracting, on macos the `unarchive` module might fails as it asks for gtar but default macos tar is `bsdtar`. The workaround is to run it as command on macos machines. Signed-off-by: [email protected]
1 parent d483066 commit dd6d373

File tree

1 file changed

+13
-6
lines changed
  • ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Ant-Contrib/tasks

1 file changed

+13
-6
lines changed

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Ant-Contrib/tasks/main.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@
6969
tags: ant-contrib
7070

7171
- name: Download ant-contrib (macOS) and (Solaris)
72-
command: wget https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-{{ antContribVersion }}/ant-contrib-{{ antContribVersion }}-bin.tar.gz -O /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz
73-
retries: 3
74-
delay: 5
75-
register: antContrib_download
76-
until: antContrib_download is not failed
72+
get_url:
73+
url: https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-{{ antContribVersion }}/ant-contrib-{{ antContribVersion }}-bin.tar.gz?viasf=1
74+
dest: /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz
7775
when:
7876
- not antcontrib_status.stat.exists
7977
- ansible_distribution == "MacOSX" or ansible_distribution == "Solaris"
@@ -84,7 +82,16 @@
8482
src: /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz
8583
dest: /tmp/
8684
copy: False
87-
when: not antcontrib_status.stat.exists
85+
when:
86+
- not antcontrib_status.stat.exists
87+
- ansible_distribution != "MacOSX"
88+
tags: ant-contrib
89+
90+
- name: Extract ant-contrib MACOS
91+
command: tar -xvf /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz -C /tmp
92+
when:
93+
- not antcontrib_status.stat.exists
94+
- ansible_distribution == "MacOSX"
8895
tags: ant-contrib
8996

9097
- name: Move ant-contrib.jar to ant lib folder

0 commit comments

Comments
 (0)