Merge pull request #9518 from camptocamp/renovate/master-major-24-ci-…

…dependencies Update dependency ubuntu to v24 (master)
camptocamp · Oct 31, 2024 · c98e0d1 · c98e0d1
2 parents 1c68af2 + 2c2616c
commit c98e0d1
Show file tree

Hide file tree

Showing 76 changed files with 28 additions and 11 deletions.
diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml
@@ -12,7 +12,7 @@ env:
 jobs:
   backport:
     name: Backport
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
 
     steps:

diff --git a/.github/workflows/clean-ghpages.yaml b/.github/workflows/clean-ghpages.yaml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   clean:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Clean GitHub pages
     timeout-minutes: 5
     concurrency: gh-pages-push

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -19,7 +19,7 @@ env:
 jobs:
   not-failed-backport:
     name: Test that's not a failed backport
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
 
     steps:
@@ -28,12 +28,13 @@ jobs:
 
   main:
     name: Continuous integration
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 50
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 
     env:
       PATH: /bin:/usr/bin:/usr/local/bin:/home/runner/.local/bin
+      REGENERATE_EXAMPLES: 'false'
 
     steps:
       - run: /opt/google/chrome/chrome --version
@@ -114,7 +115,10 @@ jobs:
           NODE_OPTIONS: --openssl-legacy-provider
         if: github.event_name != 'pull_request_target'
       - run: make check-examples-checker
-        if: github.event_name != 'pull_request_target'
+        if: |
+          github.event_name != 'pull_request_target'
+          && env.REGENERATE_EXAMPLES == 'false'
+
         # Cypress tests
       - run: make serve-gmf-apps &
         if: github.event_name != 'pull_request_target'
@@ -132,6 +136,11 @@ jobs:
           NODE_OPTIONS: --openssl-legacy-provider
       - run: make check-examples
         if: github.event_name != 'pull_request_target'
+      - run: |
+          rm examples/error-ref.png
+          find . ! -name *-ref.png -type f -exec rm {} \;
+        if: env.REGENERATE_EXAMPLES == 'true'
+      - run: '[ ${REGENERATE_EXAMPLES} == false ]'
       - uses: actions/upload-artifact@v4
         with:
           name: Examples
@@ -222,7 +231,7 @@ jobs:
 
   gh-pages:
     name: Github Pages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     concurrency: gh-pages-push
     needs:

diff --git a/.github/workflows/pull-request-automation.yaml b/.github/workflows/pull-request-automation.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   auto-merge:
     name: Auto reviews pull requests from bots
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
 
     steps:

diff --git a/Makefile b/Makefile
@@ -303,7 +303,8 @@ contribs/dist: .build/build-dll.timestamp
 	mkdir -p $(dir $@)
 	CI=true LANGUAGE=en_US buildtools/retry node buildtools/check-example.js \
 		.build/examples-hosted/error.html
-	! buildtools/check-example .build/examples-hosted/error.html.png examples/error-ref.png
+	# Only if REGENERATE_EXAMPLES is not true
+	! ( [ ${REGENERATE_EXAMPLES} != true ] && buildtools/check-example .build/examples-hosted/error.html.png examples/error-ref.png )
 	touch $@
 
 # Add --generate as argument to buildtools/check-example to regenerate the reference images

diff --git a/buildtools/check-example b/buildtools/check-example
@@ -84,9 +84,16 @@ def main():
         stdout=subprocess.PIPE,
     )
     result = float(result.stdout.decode().splitlines()[-1].split()[1])
-    if result > 0.01:
-        print(f"{result} > 0.01 => {diff}")
-        sys.exit(1)
+    if os.environ.get("REGENERATE_EXAMPLES") == "true":
+        if result > 0:
+            shutil.copyfile(current, old_ref)
+            print(f"::error file={old_ref}:: Regenerate the ref image: {old_ref}")
+        else:
+            os.remove(old_ref)
+    else:
+        if result > 0.01:
+            print(f"{result} > 0.01 => {diff}")
+            sys.exit(1)
 
 
 if __name__ == "__main__":

diff --git a/contribs/gmf/apps/desktop-ref.png b/contribs/gmf/apps/desktop-ref.png
diff --git a/contribs/gmf/apps/desktop_alt-ref.png b/contribs/gmf/apps/desktop_alt-ref.png
diff --git a/contribs/gmf/apps/iframe_api-ref.png b/contribs/gmf/apps/iframe_api-ref.png
diff --git a/contribs/gmf/apps/oeedit-ref.png b/contribs/gmf/apps/oeedit-ref.png
diff --git a/contribs/gmf/examples/backgroundlayerselector-ref.png b/contribs/gmf/examples/backgroundlayerselector-ref.png
diff --git a/contribs/gmf/examples/contextualdata-ref.png b/contribs/gmf/examples/contextualdata-ref.png
diff --git a/contribs/gmf/examples/datepicker-ref.png b/contribs/gmf/examples/datepicker-ref.png
diff --git a/contribs/gmf/examples/displayquerygrid-ref.png b/contribs/gmf/examples/displayquerygrid-ref.png
diff --git a/contribs/gmf/examples/displayquerywindow-ref.png b/contribs/gmf/examples/displayquerywindow-ref.png
diff --git a/contribs/gmf/examples/drawfeature-ref.png b/contribs/gmf/examples/drawfeature-ref.png
diff --git a/contribs/gmf/examples/elevation-ref.png b/contribs/gmf/examples/elevation-ref.png
diff --git a/contribs/gmf/examples/featurestyle-ref.png b/contribs/gmf/examples/featurestyle-ref.png
diff --git a/contribs/gmf/examples/importdatasource-ref.png b/contribs/gmf/examples/importdatasource-ref.png
diff --git a/contribs/gmf/examples/layertree-ref.png b/contribs/gmf/examples/layertree-ref.png
diff --git a/contribs/gmf/examples/layertreeadd-ref.png b/contribs/gmf/examples/layertreeadd-ref.png
diff --git a/contribs/gmf/examples/mobilemeasure-ref.png b/contribs/gmf/examples/mobilemeasure-ref.png
diff --git a/contribs/gmf/examples/mouseposition-ref.png b/contribs/gmf/examples/mouseposition-ref.png
diff --git a/contribs/gmf/examples/objectediting-ref.png b/contribs/gmf/examples/objectediting-ref.png
diff --git a/contribs/gmf/examples/objecteditinghub-ref.png b/contribs/gmf/examples/objecteditinghub-ref.png
diff --git a/contribs/gmf/examples/permalink-ref.png b/contribs/gmf/examples/permalink-ref.png
diff --git a/contribs/gmf/examples/print-ref.png b/contribs/gmf/examples/print-ref.png
diff --git a/contribs/gmf/examples/profile-ref.png b/contribs/gmf/examples/profile-ref.png
diff --git a/contribs/gmf/examples/search-ref.png b/contribs/gmf/examples/search-ref.png
diff --git a/contribs/gmf/examples/share-ref.png b/contribs/gmf/examples/share-ref.png
diff --git a/contribs/gmf/examples/simple-ref.png b/contribs/gmf/examples/simple-ref.png
diff --git a/contribs/gmf/examples/themeselector-ref.png b/contribs/gmf/examples/themeselector-ref.png
diff --git a/contribs/gmf/examples/timeslider-ref.png b/contribs/gmf/examples/timeslider-ref.png
diff --git a/contribs/gmf/examples/wfspermalink-ref.png b/contribs/gmf/examples/wfspermalink-ref.png
diff --git a/contribs/gmf/examples/xsdattributes-ref.png b/contribs/gmf/examples/xsdattributes-ref.png
diff --git a/examples/animation-ref.png b/examples/animation-ref.png
diff --git a/examples/asitvd-ref.png b/examples/asitvd-ref.png
diff --git a/examples/attributes-ref.png b/examples/attributes-ref.png
diff --git a/examples/backgroundlayer-ref.png b/examples/backgroundlayer-ref.png
diff --git a/examples/backgroundlayerdropdown-ref.png b/examples/backgroundlayerdropdown-ref.png
diff --git a/examples/colorpicker-ref.png b/examples/colorpicker-ref.png
diff --git a/examples/control-ref.png b/examples/control-ref.png
diff --git a/examples/createfeature-ref.png b/examples/createfeature-ref.png
diff --git a/examples/datepicker-ref.png b/examples/datepicker-ref.png
diff --git a/examples/datetimepicker-ref.png b/examples/datetimepicker-ref.png
diff --git a/examples/disclaimer-ref.png b/examples/disclaimer-ref.png
diff --git a/examples/displaywindow-ref.png b/examples/displaywindow-ref.png
diff --git a/examples/drawfeature-ref.png b/examples/drawfeature-ref.png
diff --git a/examples/elevationProfile-ref.png b/examples/elevationProfile-ref.png
diff --git a/examples/googlestreetview-ref.png b/examples/googlestreetview-ref.png
diff --git a/examples/grid-ref.png b/examples/grid-ref.png
diff --git a/examples/importfeatures-ref.png b/examples/importfeatures-ref.png
diff --git a/examples/interactionbtngroup-ref.png b/examples/interactionbtngroup-ref.png
diff --git a/examples/layerorder-ref.png b/examples/layerorder-ref.png
diff --git a/examples/locationsearch-ref.png b/examples/locationsearch-ref.png
diff --git a/examples/mapfishprint-ref.png b/examples/mapfishprint-ref.png
diff --git a/examples/mapillarystreetview-ref.png b/examples/mapillarystreetview-ref.png
diff --git a/examples/mapswipe-ref.png b/examples/mapswipe-ref.png
diff --git a/examples/mask-ref.png b/examples/mask-ref.png
diff --git a/examples/measure-ref.png b/examples/measure-ref.png
diff --git a/examples/mobilegeolocation-ref.png b/examples/mobilegeolocation-ref.png
diff --git a/examples/modal-ref.png b/examples/modal-ref.png
diff --git a/examples/modifycircle-ref.png b/examples/modifycircle-ref.png
diff --git a/examples/modifyrectangle-ref.png b/examples/modifyrectangle-ref.png
diff --git a/examples/notification-ref.png b/examples/notification-ref.png
diff --git a/examples/permalink-ref.png b/examples/permalink-ref.png
diff --git a/examples/popover-ref.png b/examples/popover-ref.png
diff --git a/examples/popupservice-ref.png b/examples/popupservice-ref.png
diff --git a/examples/query-ref.png b/examples/query-ref.png
diff --git a/examples/recenter-ref.png b/examples/recenter-ref.png
diff --git a/examples/rotate-ref.png b/examples/rotate-ref.png
diff --git a/examples/routing-ref.png b/examples/routing-ref.png
diff --git a/examples/scaleselector-ref.png b/examples/scaleselector-ref.png
diff --git a/examples/search-ref.png b/examples/search-ref.png
diff --git a/examples/simple-ref.png b/examples/simple-ref.png
diff --git a/examples/toolActivate-ref.png b/examples/toolActivate-ref.png