Skip to content

Commit

Permalink
Merge pull request #1 from zhan9san/feature/fix-format-issue
Browse files Browse the repository at this point in the history
Fix format issue
  • Loading branch information
zhan9san committed Aug 21, 2024
2 parents c720acb + 12196d6 commit 14ff718
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
exclude_paths:
- .github
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
- ubuntu2004
- debian12
- debian11
- amazonlinux2023
steps:
- name: Check out the codebase.
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
jdk_vesion: 17.0.2
jdk_version: 17.0.2
6 changes: 3 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
galaxy_info:
role_name: java
author: zhan9san
description: Java
issue_tracker_url: https://github.com/zhan9san/ansible-role-java/issues
license: MIT

min_ansible_version: 2.4
min_ansible_version: '2.4'

#
# Provide a list of supported platforms, and for each platform a list of versions.
Expand All @@ -15,8 +16,7 @@ galaxy_info:
platforms:
- name: EL
versions:
- 7
- 8
- all
- name: Fedora
versions:
- all
Expand Down
18 changes: 9 additions & 9 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
---

- name: Determine OS and Architecture
set_fact:
os_arch: "{{ ansible_facts['system'] }}_{{ ansible_facts['architecture'] if ansible_facts['architecture'] else 'x86_64' }}"
ansible.builtin.set_fact:
os_arch_version: "{{ ansible_facts['system'] }}_{{ ansible_facts['architecture'] if ansible_facts['architecture'] else 'x86_64' }}_{{ jdk_vesion_safe }}"

- name: Print OS and Architecture
debug:
msg: "The OS and Architecture is {{ os_arch }}"
ansible.builtin.debug:
msg: "The OS and Architecture is {{ os_arch_version }}"

- name: Set download URL
set_fact:
download_url: "{{ download_urls[os_arch] }}"
when: os_arch in download_urls
ansible.builtin.set_fact:
download_url: "{{ download_urls[os_arch_version] }}"
when: os_arch_version in download_urls

- name: Print download URL
debug:
ansible.builtin.debug:
msg: "The download URL is {{ download_url }}"
when: download_url is defined and download_url != ''

- name: Get JDK
ansible.builtin.unarchive:
src: "{{ download_url }}"
dest: /opt
remote_src: yes
remote_src: true
4 changes: 2 additions & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
jdk_vesion_safe: "{{ jdk_version | replace('.', '_') }}"

download_urls:
Win32NT_17_0_2: "https://download.java.net/java/GA/jdk17.0.1/2a2082e5a09d4267845be086888add4f/12/GPL/openjdk-17.0.1_windows-x64_bin.zip"
Win32NT_x86_64_17_0_2: "https://download.java.net/java/GA/jdk17.0.1/2a2082e5a09d4267845be086888add4f/12/GPL/openjdk-17.0.1_windows-x64_bin.zip"
Darwin_arm64_17_0_2: "https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_macos-aarch64_bin.tar.gz"
Darwin_x86_64_17_0_2: "https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_macos-x64_bin.tar.gz"
Linux_x86_64_17_0_2: "https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz"

Win32NT_21_0_2: "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
Win32NT_x86_64_21_0_2: "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_windows-x64_bin.zip"
Darwin_arm64_21_0_2: "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz"
Darwin_x86_64_21_0_2: "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-x64_bin.tar.gz"
Linux_x86_64_21_0_2: "https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz"

0 comments on commit 14ff718

Please sign in to comment.