From ecef695c44c9c3d496d29735ec80030b146f6725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 10 Oct 2024 08:39:50 +0200 Subject: [PATCH 1/2] Fix rebuild and monthly release workflows --- .github/workflows/monthly-release.yaml | 2 ++ .github/workflows/rebuild.yaml | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/monthly-release.yaml b/.github/workflows/monthly-release.yaml index 8331caa7d..8af53f23c 100644 --- a/.github/workflows/monthly-release.yaml +++ b/.github/workflows/monthly-release.yaml @@ -16,6 +16,8 @@ jobs: with: fetch-depth: 0 - uses: actions/setup-python@v5 + with: + python-version: '3.11' - run: pip install --requirement=ci/requirements.txt - run: .github/monthly-release diff --git a/.github/workflows/rebuild.yaml b/.github/workflows/rebuild.yaml index 9afa5808c..95e0bc1b1 100644 --- a/.github/workflows/rebuild.yaml +++ b/.github/workflows/rebuild.yaml @@ -56,8 +56,10 @@ jobs: - run: echo "enablePublishing=true" > gradle.properties - run: git diff - - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH} - - run: python3 -m pip install --user --requirement=ci/requirements.txt + - uses: actions/setup-python@v5 + with: + python-version: '3.11' + - run: python3 -m pip install --requirement=ci/requirements.txt - run: make build From d1b0868d525472c54d46eff80d5305056c4d4624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Fri, 11 Oct 2024 12:07:58 +0200 Subject: [PATCH 2/2] Set expected image as expected --- .../print/processor/map/CreateMapProcessorWmtsBufferTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java index 5796362af..770e4fc8b 100644 --- a/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java +++ b/core/src/test/java/org/mapfish/print/processor/map/CreateMapProcessorWmtsBufferTest.java @@ -76,7 +76,7 @@ public void testExecute() throws Exception { List layerGraphics = (List) values.getObject("layerGraphics", List.class); assertEquals(1, layerGraphics.size()); - new ImageSimilarity(new File(layerGraphics.get(0))) - .assertSimilarity(getFile(BASE_DIR + "/expectedSimpleImage.png"), 0); + new ImageSimilarity(getFile(BASE_DIR + "/expectedSimpleImage.png")) + .assertSimilarity(new File(layerGraphics.get(0)), 0); } }