Skip to content

Commit

Permalink
Merge branch 'master' into ubuntu-noble
Browse files Browse the repository at this point in the history
  • Loading branch information
freemanjp authored Aug 11, 2024
2 parents 4924651 + 2ca18a2 commit 1427e31
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 14 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ are shown below):
```yaml
# IntelliJ IDEA version number
intellij_version: '2024.1.4'
intellij_version: '2024.2'

# Mirror where to dowload IntelliJ IDEA redistributable package from
# Using HTTP because of https://github.com/ansible/ansible/issues/11579
Expand Down Expand Up @@ -142,6 +142,7 @@ The following versions of IntelliJ IDEA are supported without any additional
configuration (for other versions follow the Advanced Configuration
instructions):
* `2024.2`
* `2024.1.4`
* `2024.1.3`
* `2024.1.2`
Expand Down Expand Up @@ -384,7 +385,7 @@ This role exports the following Ansible facts for use by other roles:

* `ansible_local.intellij.general.home`

* e.g. `/opt/idea/idea-community-2024.1.4`
* e.g. `/opt/idea/idea-community-2024.2`

* `ansible_local.intellij.general.desktop_filename`

Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# code: language=ansible
---
# IntelliJ IDEA version number
intellij_version: '2024.1.4'
intellij_version: '2024.2'

# Mirror where to dowload IntelliJ IDEA redistributable package from
# Using HTTP because of https://github.com/ansible/ansible/issues/11579
Expand Down
10 changes: 5 additions & 5 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@

- name: Download jdk 11
ansible.builtin.get_url:
url: 'https://api.adoptopenjdk.net/v3/binary/version/jdk-11.0.6%2B10/linux/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk'
dest: '/opt/java/jdk-11.0.6.tar.gz'
url: 'https://api.adoptium.net/v3/binary/version/jdk-11.0.24%2B8/linux/x64/jdk/hotspot/normal/adoptium?project=jdk'
dest: '/opt/java/jdk-11.0.24.tar.gz'
force: false
use_proxy: true
validate_certs: true
Expand All @@ -61,18 +61,18 @@
- name: Install jdk 11
become: true
ansible.builtin.unarchive:
src: '/opt/java/jdk-11.0.6.tar.gz'
src: '/opt/java/jdk-11.0.24.tar.gz'
remote_src: true
dest: '/opt/java'
owner: root
group: root
mode: 'o-w'
creates: '/opt/java/jdk-11.0.6+10/bin'
creates: '/opt/java/jdk-11.0.24+8/bin'

- name: Set facts for openjdk locations
ansible.builtin.set_fact:
jdk8_home: '/usr/lib/jvm/java-1.8.0-openjdk-amd64'
jdk11_home: '/opt/java/jdk-11.0.6+10'
jdk11_home: '/opt/java/jdk-11.0.24+8'

- name: Create example files dir
become: true
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/tests/test_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def test_idea_installed(host):
@pytest.mark.parametrize('file_path,expected_text', [
('disabled_plugins.txt', 'org.jetbrains.plugins.gradle'),
('options/jdk.table.xml', '/usr/lib/jvm/java-1.8.0-openjdk'),
('options/jdk.table.xml', '/opt/java/jdk-11.0.6+10'),
('options/jdk.table.xml', '/opt/java/jdk-11.0.24+8'),
('options/project.default.xml', '/test/maven/home'),
('codestyles/Example1.xml', 'code_scheme name="Example1"'),
('codestyles/Example2.xml', 'code_scheme name="Example2"'),
Expand Down
10 changes: 5 additions & 5 deletions molecule/ultimate/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

- name: Download jdk 11
ansible.builtin.get_url:
url: 'https://api.adoptopenjdk.net/v3/binary/version/jdk-11.0.6%2B10/linux/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk'
dest: '/opt/java/jdk-11.0.6.tar.gz'
url: 'https://api.adoptium.net/v3/binary/version/jdk-11.0.24%2B8/linux/x64/jdk/hotspot/normal/adoptium?project=jdk'
dest: '/opt/java/jdk-11.0.24.tar.gz'
force: false
use_proxy: true
validate_certs: true
Expand All @@ -55,18 +55,18 @@
- name: Install jdk 11
become: true
ansible.builtin.unarchive:
src: '/opt/java/jdk-11.0.6.tar.gz'
src: '/opt/java/jdk-11.0.24.tar.gz'
remote_src: true
dest: '/opt/java'
owner: root
group: root
mode: 'o-w'
creates: '/opt/java/jdk-11.0.6+10/bin'
creates: '/opt/java/jdk-11.0.24+8/bin'

- name: Set facts for openjdk locations
ansible.builtin.set_fact:
jdk8_home: '/usr/lib/jvm/java-1.8.0-openjdk-amd64'
jdk11_home: '/opt/java/jdk-11.0.6+10'
jdk11_home: '/opt/java/jdk-11.0.24+8'

- name: Create example files dir
become: true
Expand Down
3 changes: 3 additions & 0 deletions vars/versions/2024.2-community.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# SHA256 sum for the redistributable package
intellij_redis_sha256sum: 70678d02fbba642b09c242a6453de4d79f411d1f6f029e357dfcd0da9ead871a
3 changes: 3 additions & 0 deletions vars/versions/2024.2-ultimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
# SHA256 sum for the redistributable package
intellij_redis_sha256sum: f059c9fd965a9dbf520381ee4119408f96c336eaa3b69a8c31abd1d716dbbfb4

0 comments on commit 1427e31

Please sign in to comment.