Regenerate the reference images

camptocamp · Sep 15, 2022 · 85ddde0 · 85ddde0
1 parent e6bf3aa
commit 85ddde0
Show file tree

Hide file tree

Showing 62 changed files with 34 additions and 187 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -108,6 +108,27 @@ jobs:
       - run: npm run build-storybook
       - run: make check-examples
         if: github.event_name != 'pull_request_target'
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Examples
+          path: examples
+          if-no-files-found: ignore
+          retention-days: 5
+        if: always()
+      - uses: actions/upload-artifact@v3
+        with:
+          name: GMF Examples
+          path: contribs/gmf/examples
+          if-no-files-found: ignore
+          retention-days: 5
+        if: always()
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Apps
+          path: contribs/gmf/apps
+          if-no-files-found: ignore
+          retention-days: 5
+        if: always()
       - uses: actions/upload-artifact@v3
         with:
           name: Examples hosted

diff --git a/buildtools/check-example b/buildtools/check-example
@@ -22,6 +22,7 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import os
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -45,17 +46,23 @@ def main():
     ref = sys.argv[2]
     mask = ref.replace("-ref", "-mask")
     diff = current.replace(".html.png", "-diff.png")
+    old_ref = ref
 
     if os.path.exists(mask):
         print("Apply mask: " + mask)
         old_current = current
-        old_ref = ref
         current = tempfile.NamedTemporaryFile(suffix="-current.png").name
         ref = tempfile.NamedTemporaryFile(suffix="-ref.png").name
-        subprocess.check_call(["gm", "composite", "-compose", "Multiply", old_current, mask, current])
-        subprocess.check_call(["gm", "composite", "-compose", "Multiply", old_ref, mask, ref])
+        subprocess.run(["gm", "composite", "-compose", "Multiply", old_current, mask, current], check=True)
+        subprocess.run(["gm", "composite", "-compose", "Multiply", old_ref, mask, ref], check=True)
 
-    result = subprocess.check_output(
+    # Set to True to regenerate ref images
+    if True:
+        if "/error-" not in ref:
+            shutil.copyfile(current, old_ref)
+            shutil.copyfile(current, ref)
+            sys.exit(0)
+    result = subprocess.run(
         [
             "gm",
             "compare",
@@ -67,7 +74,8 @@ def main():
             ref,
             "-file",
             diff,
-        ]
+        ],
+        check=True,
     )
     result = float(result.decode().split("\n")[-2].split()[1])
     if result > 0.01:

diff --git a/contribs/gmf/apps/desktop_alt-ref.png b/contribs/gmf/apps/desktop_alt-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/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/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/simple-ref.png b/contribs/gmf/examples/simple-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/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/backgroundlayer-mask.png b/examples/backgroundlayer-mask.png
diff --git a/examples/backgroundlayer-ref.png b/examples/backgroundlayer-ref.png
diff --git a/examples/backgroundlayerdropdown-mask.png b/examples/backgroundlayerdropdown-mask.png
diff --git a/examples/backgroundlayerdropdown-ref.png b/examples/backgroundlayerdropdown-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/disclaimer-ref.png b/examples/disclaimer-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/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-mask.png b/examples/mask-mask.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/modifycircle-ref.png b/examples/modifycircle-ref.png
diff --git a/examples/modifyrectangle-ref.png b/examples/modifyrectangle-ref.png
diff --git a/examples/offline-ref.png b/examples/offline-ref.png
diff --git a/examples/offline.css b/examples/offline.css
diff --git a/examples/offline.html b/examples/offline.html
diff --git a/examples/offline.js b/examples/offline.js
diff --git a/examples/permalink-ref.png b/examples/permalink-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/svg-ref.png b/examples/svg-ref.png
diff --git a/examples/toolActivate-ref.png b/examples/toolActivate-ref.png