From 30d64b3932da797ea0838501b00ab27a9fcf3c76 Mon Sep 17 00:00:00 2001
From: Nicolas Boutet <amd3002@gmail.com>
Date: Wed, 7 Aug 2024 10:08:24 +0200
Subject: [PATCH] Remove support for Ubuntu 20 and add support for Ubuntu 24
 (#4)

* Remove support for Ubuntu 20 and add support for Ubuntu 24

* wip

* wip

* wip
---
 .github/workflows/release.yml                     | 4 ++--
 .github/workflows/test.yml                        | 4 ++--
 Readme.md                                         | 2 +-
 meta/main.yml                                     | 2 +-
 molecule/default/molecule.yml                     | 8 ++++----
 vars/{Debian-bookworm.yml => Debian-bullseye.yml} | 1 -
 vars/Ubuntu-jammy.yml                             | 5 -----
 vars/default.yml                                  | 1 +
 8 files changed, 11 insertions(+), 16 deletions(-)
 rename vars/{Debian-bookworm.yml => Debian-bullseye.yml} (79%)
 delete mode 100644 vars/Ubuntu-jammy.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac6e141..3988faa 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b23c219..d9cf74d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.x"
 
diff --git a/Readme.md b/Readme.md
index b153208..47e9231 100644
--- a/Readme.md
+++ b/Readme.md
@@ -16,8 +16,8 @@ Supported Platforms
 
 - [Debian - 11 (Bullseye)](https://wiki.debian.org/DebianBullseye)
 - [Debian - 12 (Bookworm)](https://wiki.debian.org/DebianBookworm)
-- [Ubuntu - 20.04 (Focal Fossa)](http://releases.ubuntu.com/20.04/)
 - [Ubuntu - 22.04 (Jammy Jellyfish)](http://releases.ubuntu.com/22.04/)
+- [Ubuntu - 24.04 (Noble Numbat)](http://releases.ubuntu.com/24.04/)
 
 Role Variables
 --------------
diff --git a/meta/main.yml b/meta/main.yml
index 2b5e06b..60e39de 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -9,8 +9,8 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - focal
         - jammy
+        - noble
     - name: Debian
       versions:
         - bookworm
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index a41b06b..99d6834 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -28,8 +28,8 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
-  - name: ansible-role-tigervnc-ubuntu-2004
-    image: ubuntu:20.04
+  - name: ansible-role-tigervnc-ubuntu-2204
+    image: ubuntu:22.04
     command: /lib/systemd/systemd
     tmpfs:
       - /run
@@ -37,8 +37,8 @@ platforms:
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     cgroupns_mode: host
-  - name: ansible-role-tigervnc-ubuntu-2204
-    image: ubuntu:22.04
+  - name: ansible-role-tigervnc-ubuntu-2404
+    image: ubuntu:24.04
     command: /lib/systemd/systemd
     tmpfs:
       - /run
diff --git a/vars/Debian-bookworm.yml b/vars/Debian-bullseye.yml
similarity index 79%
rename from vars/Debian-bookworm.yml
rename to vars/Debian-bullseye.yml
index e988668..655c91f 100644
--- a/vars/Debian-bookworm.yml
+++ b/vars/Debian-bullseye.yml
@@ -2,4 +2,3 @@
 tigervnc_packages:
   - tigervnc-common
   - tigervnc-standalone-server
-  - tigervnc-tools
diff --git a/vars/Ubuntu-jammy.yml b/vars/Ubuntu-jammy.yml
deleted file mode 100644
index e988668..0000000
--- a/vars/Ubuntu-jammy.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-tigervnc_packages:
-  - tigervnc-common
-  - tigervnc-standalone-server
-  - tigervnc-tools
diff --git a/vars/default.yml b/vars/default.yml
index 655c91f..e988668 100644
--- a/vars/default.yml
+++ b/vars/default.yml
@@ -2,3 +2,4 @@
 tigervnc_packages:
   - tigervnc-common
   - tigervnc-standalone-server
+  - tigervnc-tools