Skip to content

Make compatible with ansible 2.10.3 in windows target/adoptopenjdk-fallback combination #119

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

Open
rockdreamer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Make compatible with ansible 2.10.3 in windows target/adoptopenjdk-fallback combination #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e518d0
Update adoptopenjdk fallback fetching on windows
rockdreamer Nov 24, 2020
5971de1
Use .path from result of win_tempfile
rockdreamer Nov 24, 2020
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
14 changes: 6 additions & 8 deletions tasks/Win32NT/fetch/adoptopenjdk-fallback.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
- name: Find release url
set_fact:
release_url: >-
{{ (download_page.content | from_json).binaries | map(attribute='package.binary_link') | list +
(download_page.content | from_json).binaries | map(attribute='package.checksum_link') | list }}
{{ (download_page.content | from_json)[0].binaries | map(attribute='package.link') | list +
(download_page.content | from_json)[0].binaries | map(attribute='package.checksum_link') | list }}

- name: Exit if AdobtOpenJDK version is not found
fail:
Expand All @@ -33,18 +33,16 @@

- name: 'Get artifact checksum from file {{ release_url[1] }}'
set_fact:
artifact_checksum:
content: >-
{{ artifact_checksum_file['content'] |
regex_search('([^\s]+)')
}}
artifact_checksum: >-
{{ artifact_checksum_file['content']
| regex_search('([^\s]+)') }}

- name: 'Download artifact from {{ release_url[0] }}'
win_get_url:
url: '{{ release_url[0] }}'
dest: '{{ java_download_path }}'
force: true
checksum: '{{ artifact_checksum.content }}'
checksum: '{{ artifact_checksum }}'
checksum_algorithm: sha256
register: file_downloaded
retries: 20
Expand Down
4 changes: 2 additions & 2 deletions tasks/Win32NT/install/adoptopenjdk_tarball.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
- name: Unarchive to temporary directory
win_unzip:
src: '{{ java_artifact }}'
dest: '{{ temp_dir_path }}'
dest: '{{ temp_dir_path.path }}'

- name: Find java_folder in temp
win_find:
paths: '{{ temp_dir_path }}'
paths: '{{ temp_dir_path.path }}'
recurse: false
file_type: directory
register: java_temp_folder
Expand Down