diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index d0cc8dbfc7c3..0aa5c0d548b8 100644 --- 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 index d636d0a56508..f82b5d779ce9 100644 --- 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 index a0b0492151ef..884132fc4166 100644 --- 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 index c47cd30c2b58..6ef14ff19987 100644 --- 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 index 0e614efde42d..2c1bea81eef8 100644 --- 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 index 3e34eb37be2d..1fffe4c7a2cc 100755 --- 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 index 7ba2120922ed..da62339f0264 100644 Binary files a/contribs/gmf/apps/desktop-ref.png and b/contribs/gmf/apps/desktop-ref.png differ diff --git a/contribs/gmf/apps/desktop_alt-ref.png b/contribs/gmf/apps/desktop_alt-ref.png index beeb81265314..bbca7f571aec 100644 Binary files a/contribs/gmf/apps/desktop_alt-ref.png and b/contribs/gmf/apps/desktop_alt-ref.png differ diff --git a/contribs/gmf/apps/iframe_api-ref.png b/contribs/gmf/apps/iframe_api-ref.png index b23148d6f0f5..772fe494362d 100644 Binary files a/contribs/gmf/apps/iframe_api-ref.png and b/contribs/gmf/apps/iframe_api-ref.png differ diff --git a/contribs/gmf/apps/oeedit-ref.png b/contribs/gmf/apps/oeedit-ref.png index 4c1a809fc16c..d6af9cceeaa0 100644 Binary files a/contribs/gmf/apps/oeedit-ref.png and b/contribs/gmf/apps/oeedit-ref.png differ diff --git a/contribs/gmf/examples/backgroundlayerselector-ref.png b/contribs/gmf/examples/backgroundlayerselector-ref.png index a13570e2e64a..022980cae91b 100644 Binary files a/contribs/gmf/examples/backgroundlayerselector-ref.png and b/contribs/gmf/examples/backgroundlayerselector-ref.png differ diff --git a/contribs/gmf/examples/contextualdata-ref.png b/contribs/gmf/examples/contextualdata-ref.png index fd6c0ee60f51..7c52001e8888 100644 Binary files a/contribs/gmf/examples/contextualdata-ref.png and b/contribs/gmf/examples/contextualdata-ref.png differ diff --git a/contribs/gmf/examples/datepicker-ref.png b/contribs/gmf/examples/datepicker-ref.png index 481fa07af28b..1df27afb00fd 100644 Binary files a/contribs/gmf/examples/datepicker-ref.png and b/contribs/gmf/examples/datepicker-ref.png differ diff --git a/contribs/gmf/examples/displayquerygrid-ref.png b/contribs/gmf/examples/displayquerygrid-ref.png index 5ce3bf226cf8..aab14879603c 100644 Binary files a/contribs/gmf/examples/displayquerygrid-ref.png and b/contribs/gmf/examples/displayquerygrid-ref.png differ diff --git a/contribs/gmf/examples/displayquerywindow-ref.png b/contribs/gmf/examples/displayquerywindow-ref.png index 72fa9521a8a2..4bfdc5f50f5d 100644 Binary files a/contribs/gmf/examples/displayquerywindow-ref.png and b/contribs/gmf/examples/displayquerywindow-ref.png differ diff --git a/contribs/gmf/examples/drawfeature-ref.png b/contribs/gmf/examples/drawfeature-ref.png index 4772a1c975ae..ca8e027741f9 100644 Binary files a/contribs/gmf/examples/drawfeature-ref.png and b/contribs/gmf/examples/drawfeature-ref.png differ diff --git a/contribs/gmf/examples/elevation-ref.png b/contribs/gmf/examples/elevation-ref.png index 09f3ff56d7ac..0241a55d1d91 100644 Binary files a/contribs/gmf/examples/elevation-ref.png and b/contribs/gmf/examples/elevation-ref.png differ diff --git a/contribs/gmf/examples/featurestyle-ref.png b/contribs/gmf/examples/featurestyle-ref.png index f166755efb17..843ed5956f97 100644 Binary files a/contribs/gmf/examples/featurestyle-ref.png and b/contribs/gmf/examples/featurestyle-ref.png differ diff --git a/contribs/gmf/examples/importdatasource-ref.png b/contribs/gmf/examples/importdatasource-ref.png index f0e93cd0e08b..49aca2f86a16 100644 Binary files a/contribs/gmf/examples/importdatasource-ref.png and b/contribs/gmf/examples/importdatasource-ref.png differ diff --git a/contribs/gmf/examples/layertree-ref.png b/contribs/gmf/examples/layertree-ref.png index 12bf1ea70ff8..a5621e18a7d9 100644 Binary files a/contribs/gmf/examples/layertree-ref.png and b/contribs/gmf/examples/layertree-ref.png differ diff --git a/contribs/gmf/examples/layertreeadd-ref.png b/contribs/gmf/examples/layertreeadd-ref.png index 12bf1ea70ff8..a5621e18a7d9 100644 Binary files a/contribs/gmf/examples/layertreeadd-ref.png and b/contribs/gmf/examples/layertreeadd-ref.png differ diff --git a/contribs/gmf/examples/mobilemeasure-ref.png b/contribs/gmf/examples/mobilemeasure-ref.png index df5554a25f5e..7096dfdefdc2 100644 Binary files a/contribs/gmf/examples/mobilemeasure-ref.png and b/contribs/gmf/examples/mobilemeasure-ref.png differ diff --git a/contribs/gmf/examples/mouseposition-ref.png b/contribs/gmf/examples/mouseposition-ref.png index 5bda925364bf..3b8dcd5080fb 100644 Binary files a/contribs/gmf/examples/mouseposition-ref.png and b/contribs/gmf/examples/mouseposition-ref.png differ diff --git a/contribs/gmf/examples/objectediting-ref.png b/contribs/gmf/examples/objectediting-ref.png index 9470231e128c..b26acd8ab714 100644 Binary files a/contribs/gmf/examples/objectediting-ref.png and b/contribs/gmf/examples/objectediting-ref.png differ diff --git a/contribs/gmf/examples/objecteditinghub-ref.png b/contribs/gmf/examples/objecteditinghub-ref.png index ca6867a4e512..69e9bc7ca7d5 100644 Binary files a/contribs/gmf/examples/objecteditinghub-ref.png and b/contribs/gmf/examples/objecteditinghub-ref.png differ diff --git a/contribs/gmf/examples/permalink-ref.png b/contribs/gmf/examples/permalink-ref.png index d59e7fdc9b27..64c09963571b 100644 Binary files a/contribs/gmf/examples/permalink-ref.png and b/contribs/gmf/examples/permalink-ref.png differ diff --git a/contribs/gmf/examples/print-ref.png b/contribs/gmf/examples/print-ref.png index e2f710ebf72e..12d9b30db4df 100644 Binary files a/contribs/gmf/examples/print-ref.png and b/contribs/gmf/examples/print-ref.png differ diff --git a/contribs/gmf/examples/profile-ref.png b/contribs/gmf/examples/profile-ref.png index 43fddb58c885..6d9c3f14b592 100644 Binary files a/contribs/gmf/examples/profile-ref.png and b/contribs/gmf/examples/profile-ref.png differ diff --git a/contribs/gmf/examples/search-ref.png b/contribs/gmf/examples/search-ref.png index d5e5ff05fcf6..1d2b119b4dfa 100644 Binary files a/contribs/gmf/examples/search-ref.png and b/contribs/gmf/examples/search-ref.png differ diff --git a/contribs/gmf/examples/share-ref.png b/contribs/gmf/examples/share-ref.png index 9a3f03eccc26..5a0820467843 100644 Binary files a/contribs/gmf/examples/share-ref.png and b/contribs/gmf/examples/share-ref.png differ diff --git a/contribs/gmf/examples/simple-ref.png b/contribs/gmf/examples/simple-ref.png index 178d642e2561..eaee3679c0e0 100644 Binary files a/contribs/gmf/examples/simple-ref.png and b/contribs/gmf/examples/simple-ref.png differ diff --git a/contribs/gmf/examples/themeselector-ref.png b/contribs/gmf/examples/themeselector-ref.png index b133b670ab60..4d3d4b23463f 100644 Binary files a/contribs/gmf/examples/themeselector-ref.png and b/contribs/gmf/examples/themeselector-ref.png differ diff --git a/contribs/gmf/examples/timeslider-ref.png b/contribs/gmf/examples/timeslider-ref.png index e899bedf8001..830a522fce8e 100644 Binary files a/contribs/gmf/examples/timeslider-ref.png and b/contribs/gmf/examples/timeslider-ref.png differ diff --git a/contribs/gmf/examples/wfspermalink-ref.png b/contribs/gmf/examples/wfspermalink-ref.png index 21417934340e..075a9336b3fb 100644 Binary files a/contribs/gmf/examples/wfspermalink-ref.png and b/contribs/gmf/examples/wfspermalink-ref.png differ diff --git a/contribs/gmf/examples/xsdattributes-ref.png b/contribs/gmf/examples/xsdattributes-ref.png index a472d6e043c2..d4bcaa6e8d10 100644 Binary files a/contribs/gmf/examples/xsdattributes-ref.png and b/contribs/gmf/examples/xsdattributes-ref.png differ diff --git a/examples/animation-ref.png b/examples/animation-ref.png index 36a354f8038e..b8d890d726b8 100644 Binary files a/examples/animation-ref.png and b/examples/animation-ref.png differ diff --git a/examples/asitvd-ref.png b/examples/asitvd-ref.png index 0480f680ee45..72d23f39eabf 100644 Binary files a/examples/asitvd-ref.png and b/examples/asitvd-ref.png differ diff --git a/examples/attributes-ref.png b/examples/attributes-ref.png index 46b4d9ea1555..d003d836a1a7 100644 Binary files a/examples/attributes-ref.png and b/examples/attributes-ref.png differ diff --git a/examples/backgroundlayer-ref.png b/examples/backgroundlayer-ref.png index 3a2c900a7dd6..481f4207cb56 100644 Binary files a/examples/backgroundlayer-ref.png and b/examples/backgroundlayer-ref.png differ diff --git a/examples/backgroundlayerdropdown-ref.png b/examples/backgroundlayerdropdown-ref.png index 0f14e3f5a4d1..e43f7b25ea43 100644 Binary files a/examples/backgroundlayerdropdown-ref.png and b/examples/backgroundlayerdropdown-ref.png differ diff --git a/examples/colorpicker-ref.png b/examples/colorpicker-ref.png index ebf992ee9eab..54cbb28f53cd 100644 Binary files a/examples/colorpicker-ref.png and b/examples/colorpicker-ref.png differ diff --git a/examples/control-ref.png b/examples/control-ref.png index b7dfeac6c4df..ac4a69a2a0e5 100644 Binary files a/examples/control-ref.png and b/examples/control-ref.png differ diff --git a/examples/createfeature-ref.png b/examples/createfeature-ref.png index 285d4e6007a1..4f5a2c4c5440 100644 Binary files a/examples/createfeature-ref.png and b/examples/createfeature-ref.png differ diff --git a/examples/datepicker-ref.png b/examples/datepicker-ref.png index be535f469a0f..aed1079af49f 100644 Binary files a/examples/datepicker-ref.png and b/examples/datepicker-ref.png differ diff --git a/examples/datetimepicker-ref.png b/examples/datetimepicker-ref.png index fd193ba822d4..154d26a64673 100644 Binary files a/examples/datetimepicker-ref.png and b/examples/datetimepicker-ref.png differ diff --git a/examples/disclaimer-ref.png b/examples/disclaimer-ref.png index 0e501b0342c2..b559a7f84f8f 100644 Binary files a/examples/disclaimer-ref.png and b/examples/disclaimer-ref.png differ diff --git a/examples/displaywindow-ref.png b/examples/displaywindow-ref.png index 580ef7d071f6..8e4358f2a3ce 100644 Binary files a/examples/displaywindow-ref.png and b/examples/displaywindow-ref.png differ diff --git a/examples/drawfeature-ref.png b/examples/drawfeature-ref.png index 21c7a33a98df..0b0ea1ad2b0b 100644 Binary files a/examples/drawfeature-ref.png and b/examples/drawfeature-ref.png differ diff --git a/examples/elevationProfile-ref.png b/examples/elevationProfile-ref.png index b0b55ed3899b..04dc58efdf31 100644 Binary files a/examples/elevationProfile-ref.png and b/examples/elevationProfile-ref.png differ diff --git a/examples/googlestreetview-ref.png b/examples/googlestreetview-ref.png index bb1014ade40a..1e9759a305c1 100644 Binary files a/examples/googlestreetview-ref.png and b/examples/googlestreetview-ref.png differ diff --git a/examples/grid-ref.png b/examples/grid-ref.png index 889a2cefdfbf..1a194f71da31 100644 Binary files a/examples/grid-ref.png and b/examples/grid-ref.png differ diff --git a/examples/importfeatures-ref.png b/examples/importfeatures-ref.png index 454f682fc04f..bac4fc20cc46 100644 Binary files a/examples/importfeatures-ref.png and b/examples/importfeatures-ref.png differ diff --git a/examples/interactionbtngroup-ref.png b/examples/interactionbtngroup-ref.png index c4ec51eb6958..a0ab72a23448 100644 Binary files a/examples/interactionbtngroup-ref.png and b/examples/interactionbtngroup-ref.png differ diff --git a/examples/layerorder-ref.png b/examples/layerorder-ref.png index 384bcee95e4e..6cfc8723a5cb 100644 Binary files a/examples/layerorder-ref.png and b/examples/layerorder-ref.png differ diff --git a/examples/locationsearch-ref.png b/examples/locationsearch-ref.png index c33878965bf6..3e03eacb5ab3 100644 Binary files a/examples/locationsearch-ref.png and b/examples/locationsearch-ref.png differ diff --git a/examples/mapfishprint-ref.png b/examples/mapfishprint-ref.png index a3aab079a489..02b6834d57e7 100644 Binary files a/examples/mapfishprint-ref.png and b/examples/mapfishprint-ref.png differ diff --git a/examples/mapillarystreetview-ref.png b/examples/mapillarystreetview-ref.png index 588c4d45161b..98892ba08cfa 100644 Binary files a/examples/mapillarystreetview-ref.png and b/examples/mapillarystreetview-ref.png differ diff --git a/examples/mapswipe-ref.png b/examples/mapswipe-ref.png index b3dbc29f45a6..7a9aee76a69f 100644 Binary files a/examples/mapswipe-ref.png and b/examples/mapswipe-ref.png differ diff --git a/examples/mask-ref.png b/examples/mask-ref.png index 477d95a135dc..faceb1981dd7 100644 Binary files a/examples/mask-ref.png and b/examples/mask-ref.png differ diff --git a/examples/measure-ref.png b/examples/measure-ref.png index 5139ac83e0dd..084027eb17e0 100644 Binary files a/examples/measure-ref.png and b/examples/measure-ref.png differ diff --git a/examples/mobilegeolocation-ref.png b/examples/mobilegeolocation-ref.png index 36727313df4d..9fe06acc7bdd 100644 Binary files a/examples/mobilegeolocation-ref.png and b/examples/mobilegeolocation-ref.png differ diff --git a/examples/modal-ref.png b/examples/modal-ref.png index 45850ea82094..f1c5852f147a 100644 Binary files a/examples/modal-ref.png and b/examples/modal-ref.png differ diff --git a/examples/modifycircle-ref.png b/examples/modifycircle-ref.png index 6673cfabfee1..649ee828ce79 100644 Binary files a/examples/modifycircle-ref.png and b/examples/modifycircle-ref.png differ diff --git a/examples/modifyrectangle-ref.png b/examples/modifyrectangle-ref.png index 815badf04c15..d79a1cdda17f 100644 Binary files a/examples/modifyrectangle-ref.png and b/examples/modifyrectangle-ref.png differ diff --git a/examples/notification-ref.png b/examples/notification-ref.png index c7446fe87b7f..0bb45c3caeb3 100644 Binary files a/examples/notification-ref.png and b/examples/notification-ref.png differ diff --git a/examples/permalink-ref.png b/examples/permalink-ref.png index 833f888cc053..1e72081e74e6 100644 Binary files a/examples/permalink-ref.png and b/examples/permalink-ref.png differ diff --git a/examples/popover-ref.png b/examples/popover-ref.png index fabc51953e30..1ccc40aebd19 100644 Binary files a/examples/popover-ref.png and b/examples/popover-ref.png differ diff --git a/examples/popupservice-ref.png b/examples/popupservice-ref.png index c89161cab176..27da8a3b7f88 100644 Binary files a/examples/popupservice-ref.png and b/examples/popupservice-ref.png differ diff --git a/examples/query-ref.png b/examples/query-ref.png index b5df7f211b69..e639dfeb5233 100644 Binary files a/examples/query-ref.png and b/examples/query-ref.png differ diff --git a/examples/recenter-ref.png b/examples/recenter-ref.png index c3766261644d..29ffa251534c 100644 Binary files a/examples/recenter-ref.png and b/examples/recenter-ref.png differ diff --git a/examples/rotate-ref.png b/examples/rotate-ref.png index b77391c99765..ee244b764648 100644 Binary files a/examples/rotate-ref.png and b/examples/rotate-ref.png differ diff --git a/examples/routing-ref.png b/examples/routing-ref.png index b787b9eafdcc..3e0662df58d5 100644 Binary files a/examples/routing-ref.png and b/examples/routing-ref.png differ diff --git a/examples/scaleselector-ref.png b/examples/scaleselector-ref.png index 40742cc5b7b2..f62210e8c8c9 100644 Binary files a/examples/scaleselector-ref.png and b/examples/scaleselector-ref.png differ diff --git a/examples/search-ref.png b/examples/search-ref.png index d61bf89ad928..8b14ad73e15c 100644 Binary files a/examples/search-ref.png and b/examples/search-ref.png differ diff --git a/examples/simple-ref.png b/examples/simple-ref.png index 2b5dd68f0331..7d79d7ca2582 100644 Binary files a/examples/simple-ref.png and b/examples/simple-ref.png differ diff --git a/examples/toolActivate-ref.png b/examples/toolActivate-ref.png index 3d94b7b3c058..ce79360197f6 100644 Binary files a/examples/toolActivate-ref.png and b/examples/toolActivate-ref.png differ