Merge pull request #10594 from camptocamp/update-ubuntu-2.8

Update the used Ubuntu version to from 20.04 to 22.04 in the workflows
camptocamp · Jul 20, 2023 · 982b1ea · 982b1ea
2 parents d4a2e2f + 3d8d89f
commit 982b1ea
Show file tree

Hide file tree

Showing 21 changed files with 59 additions and 66 deletions.
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-Build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Code scanning
     timeout-minutes: 25
 

diff --git a/.github/workflows/delete-old-workflows-run.yaml b/.github/workflows/delete-old-workflows-run.yaml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 25
     name: Delete old workflow runs
 

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -14,15 +14,15 @@ env:
 
 jobs:
   not-failed-backport:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Test that's not a failed backport
     timeout-minutes: 5
     steps:
       - run: 'false'
         if: github.event.head_commit.message == '[skip ci] Add instructions to finish the backport.'
 
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Continuous integration
     timeout-minutes: 135
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
@@ -132,11 +132,10 @@ jobs:
         with:
           # When we upgrade this we should also upgrade the requirements
           # in the documentation: doc/integrator/requirements.rst
-          python-version: '3.5'
+          python-version: '3.7'
         # When we upgrade this we should also upgrade the requirements
         # in the documentation: doc/integrator/requirements.rst
-        # netifaces is for 2.4
-      - run: pip install --user PyYAML==3.12 docker-compose==1.25.0
+      - run: pip install --user PyYAML==3.13 docker-compose==1.25.0 urllib3==1.26.15
 
         # Test App
       - run: ci/test-app
@@ -168,7 +167,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - run: pip install --user PyYAML docker-compose wheel urllib3==1.26.15
+      - run: pip install --user PyYAML==5.3.1 docker-compose==1.29.2 wheel==0.40.0 urllib3==1.26.15
 
       - name: Init Git
         run:

diff --git a/.github/workflows/ngeo-2-5.yaml b/.github/workflows/ngeo-2-5.yaml
@@ -1,4 +1,3 @@
----
 name: Update ngeo 2.5
 
 on:
@@ -8,7 +7,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Update ngeo 2.5
     timeout-minutes: 70
 
@@ -154,11 +153,9 @@ jobs:
       - run: git diff CHANGELOG.md
 
       - name: Publish
-        run: c2cciutils-publish --group=full --type=version_branch
-          --version=${{ steps.version.outputs.major }}
+        run: c2cciutils-publish --group=full --type=version_branch --version=${{ steps.version.outputs.major }}
       - name: Publish
-        run: c2cciutils-publish --group=full --type=version_branch
-          --version=${{ steps.version.outputs.full }}
+        run: c2cciutils-publish --group=full --type=version_branch --version=${{ steps.version.outputs.full }}
 
       - run: ci/create-new-project ${HOME}/workspace geomapfish
       - run: (cd ${HOME}/workspace/geomapfish/; ./build)

diff --git a/.github/workflows/ngeo-2-6.yaml b/.github/workflows/ngeo-2-6.yaml
@@ -1,4 +1,3 @@
----
 name: Update ngeo 2.6
 
 on:
@@ -8,7 +7,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Update ngeo 2.6
     timeout-minutes: 70
 
@@ -101,7 +100,7 @@ jobs:
             docker-compose logs ${service}
           done
         if: failure()
-        continue-on-error: True
+        continue-on-error: true
 
       - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
       - run: scripts/get-version --force-increment --github
@@ -117,8 +116,9 @@ jobs:
       - run: ci/test-upgrade cleanup ${HOME}/workspace
 
       - name: Init Git
-        run: git remote set-url origin
-          https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        run:
+          git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository
+          }}
       - run: make build-tools
       - run: make build-runner
       - run: make build-config

diff --git a/.github/workflows/ngeo-2-7.yaml b/.github/workflows/ngeo-2-7.yaml
@@ -1,4 +1,3 @@
----
 name: Update ngeo 2.7
 
 on:
@@ -11,7 +10,7 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Continuous integration
     timeout-minutes: 90
 
@@ -110,7 +109,7 @@ jobs:
           cd ${HOME}/workspace/testgeomapfishapp/
           c2cciutils-docker-logs
         if: failure()
-        continue-on-error: True
+        continue-on-error: true
 
       - run: git pull --ff-only origin ${{ env.MAIN_BRANCH }}
       - run: scripts/get-version --auto-increment --github
@@ -128,8 +127,9 @@ jobs:
       - run: ci/test-upgrade cleanup ${HOME}/workspace
 
       - name: Init Git
-        run: git remote set-url origin
-          https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        run:
+          git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository
+          }}
       - run: make build-tools
       - run: make build-runner
       - run: make build-config

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -13,7 +13,7 @@ on:
 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/pull-request-title.yaml b/.github/workflows/pull-request-title.yaml
@@ -1,4 +1,3 @@
----
 name: Pull request title check
 
 on:
@@ -12,7 +11,7 @@ on:
 jobs:
   lint:
     name: Pull request title check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 5
 
     steps:

diff --git a/.github/workflows/qgis.yaml b/.github/workflows/qgis.yaml
@@ -1,4 +1,3 @@
----
 name: QGIS build
 
 on:
@@ -16,7 +15,7 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: QGIS build
     timeout-minutes: 40
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
@@ -65,8 +64,9 @@ jobs:
           camptocamp/geomapfish-qgisserver:gmflatest-qgis${{ matrix.version }}
 
       - name: Test library availability
-        run: "! ( docker run --rm camptocamp/geomapfish-qgisserver ldd /usr/local/bin/qgis_mapserv.fcgi |
-          grep 'not found' )"
+        run:
+          "! ( docker run --rm camptocamp/geomapfish-qgisserver ldd /usr/local/bin/qgis_mapserv.fcgi | grep 'not
+          found' )"
 
       - name: Acceptance tests
         run: |

diff --git a/.github/workflows/rebuild-2-5.yaml b/.github/workflows/rebuild-2-5.yaml
@@ -1,4 +1,3 @@
----
 name: Rebuild 2.5
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Rebuild 2.5
     timeout-minutes: 70
 

diff --git a/.github/workflows/rebuild-2-6.yaml b/.github/workflows/rebuild-2-6.yaml
@@ -1,4 +1,3 @@
----
 name: Rebuild 2.6
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Rebuild 2.6
     timeout-minutes: 70
 
@@ -115,11 +114,12 @@ jobs:
             docker-compose logs ${service}
           done
         if: failure()
-        continue-on-error: True
+        continue-on-error: true
 
       - name: Init Git
-        run: git remote set-url origin
-          https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        run:
+          git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository
+          }}
       - run: make build-tools
       - run: make build-runner
       - run: make build-config

diff --git a/.github/workflows/rebuild-2-7.yaml b/.github/workflows/rebuild-2-7.yaml
@@ -1,4 +1,3 @@
----
 name: Rebuild 2.7
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Rebuild 2.7
     timeout-minutes: 90
 
@@ -103,7 +102,7 @@ jobs:
           docker cp c2cgeoportal_tests_1:/tmp/coverage/ artifacts/geoportal-coverage/
           docker cp c2cgeoportal_qgisserver-tests_1:/tmp/coverage/ artifacts/qgisserver-plugin-coverage/
         if: always()
-        continue-on-error: True
+        continue-on-error: true
       - run: c2cciutils-docker-logs
         if: always()
       - run: docker-compose down
@@ -148,11 +147,12 @@ jobs:
           cd ${HOME}/workspace/testgeomapfishapp/
           c2cciutils-docker-logs
         if: failure()
-        continue-on-error: True
+        continue-on-error: true
 
       - name: Init Git
-        run: git remote set-url origin
-          https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+        run:
+          git remote set-url origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository
+          }}
       - run: make build-tools
       - run: make build-runner
       - run: make build-config

diff --git a/.github/workflows/rebuild-master.yaml b/.github/workflows/rebuild-master.yaml
@@ -1,4 +1,3 @@
----
 name: Rebuild master
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Rebuild master
     timeout-minutes: 1
 

diff --git a/.github/workflows/rebuild-qgis-2-5.yaml b/.github/workflows/rebuild-qgis-2-5.yaml
@@ -1,4 +1,3 @@
----
 name: QGIS rebuild 2.5
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: QGIS rebuild 2.5
     timeout-minutes: 10
 
@@ -68,6 +67,5 @@ jobs:
           docker-compose down
 
       - name: Publish
-        run: c2cciutils-publish --type=rebuild --branch=${{ matrix.branch }}
-          --group=qgis-${{ matrix.version }}
+        run: c2cciutils-publish --type=rebuild --branch=${{ matrix.branch }} --group=qgis-${{ matrix.version }}
         if: github.repository == 'camptocamp/c2cgeoportal'
diff --git a/.github/workflows/rebuild-qgis-2-6.yaml b/.github/workflows/rebuild-qgis-2-6.yaml
@@ -1,4 +1,3 @@
----
 name: QGIS rebuild 2.6
 
 on:
@@ -7,7 +6,7 @@ on:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: QGIS rebuild 2.6
     timeout-minutes: 10
 
@@ -55,8 +54,9 @@ jobs:
           camptocamp/geomapfish-qgisserver:gmflatest-qgis${{ matrix.version }}
 
       - name: Test library availability
-        run: "! ( docker run --rm camptocamp/geomapfish-qgisserver ldd /usr/local/bin/qgis_mapserv.fcgi |
-          grep 'not found' )"
+        run:
+          "! ( docker run --rm camptocamp/geomapfish-qgisserver ldd /usr/local/bin/qgis_mapserv.fcgi | grep 'not
+          found' )"
 
       - name: Acceptance tests
         run: |