From 9ffbb6d128da8c1d44d9bf50ce915e58492a36b0 Mon Sep 17 00:00:00 2001
From: Jacob Oursland <jacob.oursland@gmail.com>
Date: Tue, 11 Feb 2025 16:39:51 -0800
Subject: [PATCH 1/2] CI: Rename Ubuntu 20.04 to just Ubuntu.

---
 .github/workflows/CI_master.yml                           | 8 ++++----
 .../{sub_buildUbuntu2004.yml => sub_buildUbuntu.yml}      | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{sub_buildUbuntu2004.yml => sub_buildUbuntu.yml} (100%)

diff --git a/.github/workflows/CI_master.yml b/.github/workflows/CI_master.yml
index 752b0707d7..ca74ea454c 100644
--- a/.github/workflows/CI_master.yml
+++ b/.github/workflows/CI_master.yml
@@ -45,11 +45,11 @@ jobs:
     with:
       artifactBasename: Pixi-${{ github.run_id }}
 
-  Ubuntu_20-04:
+  Ubuntu:
     needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu2004.yml
+    uses: ./.github/workflows/sub_buildUbuntu.yml
     with:
-      artifactBasename: Ubuntu_20-04-${{ github.run_id }}
+      artifactBasename: Ubuntu-${{ github.run_id }}
 
   Windows:
     needs: [Prepare]
@@ -70,7 +70,7 @@ jobs:
     needs: [
         Prepare,
         Pixi,
-        Ubuntu_20-04,
+        Ubuntu,
         Windows,
         Lint
       ]
diff --git a/.github/workflows/sub_buildUbuntu2004.yml b/.github/workflows/sub_buildUbuntu.yml
similarity index 100%
rename from .github/workflows/sub_buildUbuntu2004.yml
rename to .github/workflows/sub_buildUbuntu.yml

From 546bd59ecfb572b6e7b9c76db1a572f940acfbe0 Mon Sep 17 00:00:00 2001
From: Jacob Oursland <jacob.oursland@gmail.com>
Date: Tue, 11 Feb 2025 16:41:17 -0800
Subject: [PATCH 2/2] CI: Update Ubuntu 20.04 to Ubuntu 22.04.

---
 .github/workflows/sub_buildUbuntu.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/sub_buildUbuntu.yml b/.github/workflows/sub_buildUbuntu.yml
index 23c969e9ed..dab94d42b2 100644
--- a/.github/workflows/sub_buildUbuntu.yml
+++ b/.github/workflows/sub_buildUbuntu.yml
@@ -22,9 +22,9 @@
 # ***************************************************************************
 
 # This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on Ubuntu 20.04 using GCC.
+# This workflow aims at building and testing FreeCAD on Ubuntu 22.04 using GCC.
 
-name: Build Ubuntu 20.04
+name: Build Ubuntu 22.04
 
 on:
   workflow_call:
@@ -47,7 +47,7 @@ on:
 jobs:
 
   Build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     continue-on-error: ${{ inputs.allowedToFail }}
     env:
       CCACHE_DIR: ${{ github.workspace }}/ccache