From b42e9a14ba3d6a1ee0d2ff5a6efb4bbe1c01eba1 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Fri, 8 Nov 2024 15:33:45 +0100
Subject: [PATCH 1/3] Add support for Noble

---
 .github/workflows/ci.yml | 1 +
 Vagrantfile              | 9 ++++++++-
 meta/main.yml            | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02305bd..54e0ae1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,7 @@ jobs:
           - distro: debian12
           - distro: ubuntu2004
           - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
diff --git a/Vagrantfile b/Vagrantfile
index aef9510..187d831 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,6 +18,13 @@ boxes = [
     :cpu => "50",
     :ram => "512"
   },
+  {
+    :name => "ubuntu-2404",
+    :box => "bento/ubuntu-24.04",
+    :ip => '10.0.0.16',
+    :cpu => "50",
+    :ram => "512"
+  },
   {
     :name => "debian-11",
     :box => "bento/debian-11",
@@ -30,7 +37,7 @@ boxes = [
     :box => "bento/debian-12",
     :ip => '10.0.0.20',
     :cpu => "50",
-    :ram => "256"
+    :ram => "384"
   },
 ]
 
diff --git a/meta/main.yml b/meta/main.yml
index 6b87251..483a9db 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,9 +1,8 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: rstudio
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up (the latest version of) RStudio (IDE) in Debian-like systems
   license: MIT
@@ -13,6 +12,7 @@ galaxy_info:
       versions:
         - focal
         - jammy
+        - noble
     - name: Debian
       versions:
         - bullseye

From f0b8d1c1000830873904b750fcd23f6ab5b810b8 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Fri, 8 Nov 2024 15:58:18 +0100
Subject: [PATCH 2/3] Fix failing test

---
 vars/_noble.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 vars/_noble.yml

diff --git a/vars/_noble.yml b/vars/_noble.yml
new file mode 100644
index 0000000..82f2c03
--- /dev/null
+++ b/vars/_noble.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_preset_download_url: "https://download1.rstudio.org/electron/jammy/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"

From 2b52ec993f434903781f7a62baaba3c3c305000b Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Fri, 8 Nov 2024 16:07:28 +0100
Subject: [PATCH 3/3] Change default version

---
 README.md         | 2 +-
 defaults/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 214894f..1843e4d 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Set up (the latest version of) [RStudio (IDE)](https://www.rstudio.com/products/
 
 #### Variables
 
-* `rstudio_version` [default: `2023.03.1-446`]: Version to install
+* `rstudio_version` [default: `2024.09.1-394`]: Version to install
 * `rstudio_install` [default: `[]`]: Additional packages to install (e.g. `r-base`)
 
 ## Dependencies
diff --git a/defaults/main.yml b/defaults/main.yml
index 6021a18..3384ac9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,5 @@
 # defaults file
 ---
-rstudio_version: '2023.12.1-402'
+rstudio_version: '2024.09.1-394'
 rstudio_download_url: "{{ rstudio_preset_download_url }}"
 rstudio_install: []