Merge pull request #19548 from oursland/update-ci-ubuntu

CI: Update Ubuntu 20.04 to Ubuntu 22.04

.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
       ]

.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