Merge pull request #1902 from camptocamp/update-ubuntu-5.0

Update the used Ubuntu version to from 20.04 to 22.04 in the workflows
camptocamp · Jul 18, 2023 · fc67d19 · fc67d19
2 parents dc01d96 + 90304c1
commit fc67d19
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml
@@ -1,4 +1,3 @@
----
 name: Audit
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   audit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Audit
     timeout-minutes: 5
 

diff --git a/.github/workflows/auto-review.yaml b/.github/workflows/auto-review.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   auto-merge:
     name: Auto reviews updates
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:

diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
@@ -1,4 +1,3 @@
----
 name: Backport
 
 on:
@@ -12,7 +11,7 @@ env:
 
 jobs:
   backport:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Backport
     timeout-minutes: 5
 

diff --git a/.github/workflows/clean.yaml b/.github/workflows/clean.yaml
@@ -1,11 +1,10 @@
----
 name: Clean docker hub tags
 
 on: delete
 
 jobs:
   clean:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Clean docker hub tags
     timeout-minutes: 5
 

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -1,4 +1,3 @@
----
 name: Code scanning
 
 on:
@@ -9,7 +8,7 @@ env:
 
 jobs:
   codeql:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Code scanning
     timeout-minutes: 25
 

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,4 +1,3 @@
----
 name: Continuous integration
 
 on:
@@ -10,7 +9,7 @@ env:
 jobs:
   build:
     name: Continuous integration
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -16,7 +16,7 @@ env:
 jobs:
   build:
     name: Pull request check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:

diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml
@@ -1,4 +1,3 @@
----
 name: Rebuild
 
 on:
@@ -11,7 +10,7 @@ env:
 jobs:
   rebuild:
     name: Rebuild
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 15
 
     strategy:
@@ -51,8 +50,9 @@ jobs:
 
       - name: Install GDAL
         # with .sh for release <= 3
-        run: docker run --rm camptocamp/c2cwsgiutils install-gdal ||
-          docker run --rm camptocamp/c2cwsgiutils:latest-full /opt/c2cwsgiutils/install_gdal.sh
+        run:
+          docker run --rm camptocamp/c2cwsgiutils install-gdal || docker run --rm camptocamp/c2cwsgiutils:latest-full
+          /opt/c2cwsgiutils/install_gdal.sh
 
       - name: Publish
         run: c2cciutils-publish --type=rebuild --branch=${{ matrix.branch }}