Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unixPB: improves download and verify of ant binary #3752

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

unixPB: improves download and verify of ant binary #3752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/ant/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
tags: ant

- name: Download Apache Ant binaries (macOS) and (Solaris)
command: wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip -O /tmp/apache-ant-1.10.5-bin.zip
get_url:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in other scripts we're extracting that version

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I did not get the question here. I just changed wget command to get_url module which help prevent wget not found error on some hosts. I did not touch version.

Copy link
Contributor

@karianna karianna Oct 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, extracting 1.10.5 to a single const at the top (as it gets repeated)

url: https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip
dest: /tmp/apache-ant-1.10.5-bin.zip
when:
- ant_installed.rc != 0
- ansible_distribution == "MacOSX" or ansible_distribution == "Solaris"
Expand All @@ -46,6 +48,8 @@
- name: GPG Signature verification
script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/apache-ant-1.10.5-bin.zip -sl "https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.zip.asc" -k {{ key.apache_ant }}
when: ant_installed.rc != 0
environment:
PATH: "{{ ansible_env.PATH }}:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
tags: ant

- name: Extract ant
Expand Down
Loading