Use c2cciutils - Publish to GitHub Container Registry

.dependabot/config.yml

@@ -70,3 +70,9 @@ update_configs:
     allowed_updates:
       - match:
           update_type: security
+  - package_manager: python
+    directory: /ci
+    update_schedule: live
+    automerged_updates:
+      - match:
+          update_type: all

examples/.editorconfig → .editorconfig

@@ -1,9 +1,20 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 2
 end_of_line = lf
+insert_final_newline = true
 charset = utf-8
+indent_style = space
+indent_size = 4
 trim_trailing_whitespace = true
-insert_final_newline = true
+max_line_length = 110
+quote_type = single
+
+[*.js]
+indent_size = 2
+
+[*.yaml]
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.github/workflows/audit.yaml

@@ -6,7 +6,7 @@ on:
     - cron: '30 2 * * *'
 
 jobs:
-  main:
+  audit:
     runs-on: ubuntu-20.04
     name: Audit
     timeout-minutes: 10
@@ -21,9 +21,10 @@ jobs:
           - '3.23'
           - '3.24'
           - '3.25'
+          - master
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branch }}
 

.github/workflows/clean.yaml

@@ -0,0 +1,27 @@
+---
+name: Clean docker hub tags
+
+on: delete
+
+jobs:
+  clean:
+    runs-on: ubuntu-20.04
+    name: Clean docker hub tags
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: camptocamp/initialise-gopass-summon-action@v2
+        with:
+          ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
+          github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
+          patterns: docker
+
+      - run: |
+          sudo rm /etc/apt/sources.list.d/*.list
+          sudo apt update
+          sudo apt install --yes python3-wheel
+      - run: sudo python3 -m pip install --requirement=ci/requirements.txt
+
+      - name: Clean docker hub tags
+        run: c2cciutils-clean

.github/workflows/codeql.yaml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   CodeQL-Build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     name: Code scanning
     timeout-minutes: 15
 

.github/workflows/ci.yaml → .github/workflows/main.yaml

@@ -3,7 +3,6 @@ name: Continuous integration
 
 on:
   push:
-  pull_request:
 
 jobs:
   build:
@@ -13,11 +12,10 @@ jobs:
     if: "!startsWith(github.event.head_commit.message, '[skip ci] ')"
 
     env:
-      SUMMON_PROVIDER: /usr/local/bin/gopass
       SECRETS: ${{ secrets.SECRETS }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Get tag
         id: tag2
@@ -29,20 +27,28 @@ jobs:
         if: "startsWith(github.ref, 'refs/tags/')"
       - run: echo --${{ steps.tag2.outputs.replaced }}--
 
-      - run: git --no-pager diff --check `git log --oneline | tail -1 | cut --fields=1 --delimiter=' '`
-      - run: ci/test-eof-newline
-
-      - uses: camptocamp/initialise-gopass-summon-action@v1
+      - uses: camptocamp/initialise-gopass-summon-action@v2
         with:
           ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
           github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
+          patterns: pypi docker
         if: env.SECRETS == 'TRUE'
       - run: gpg --export-secret-keys --armor D121AF2DFA8E140688BD968930C9B913FD42EF13 > CI.asc
         if: env.SECRETS == 'TRUE'
 
       - run: echo "enablePublishing=true" > gradle.properties
         if: env.SECRETS == 'TRUE'
 
+      - run: |
+          sudo rm /etc/apt/sources.list.d/*.list
+          sudo apt update
+          sudo apt install --yes python3-wheel
+
+      - run: sudo python3 -m pip install --requirement=ci/requirements.txt
+
+      - name: Checks
+        run: c2cciutils-checks
+
       - run: make build
       - run: make acceptance-tests-up
       - run: make acceptance-tests-run
@@ -93,15 +99,8 @@ jobs:
           path: /tmp/test_results
         if: failure()
 
-      - run: mkdir -p ~/.docker
-      - name: Decrypt secrets
-        run: summon --environment dockerhub bash -c 'envsubst < ci/docker-config.json.tmpl > ~/.docker/config.json'
-        if: env.SECRETS == 'TRUE'
-
-      - name: publish
-        run: ci/publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish
+        run: c2cciutils-publish
         if: env.SECRETS == 'TRUE'
 
       - id: version

.github/workflows/rebuild-old.yaml

@@ -18,6 +18,9 @@ jobs:
       fail-fast: false
       matrix:
         branch:
+          - '3.20'
+          - '3.21'
+          - '3.22'
           - '3.23'
 
     steps:
@@ -48,13 +51,11 @@ jobs:
           sudo apt update
           sudo apt install fonts-liberation
 
-      - run: git --no-pager diff --check `git log --oneline | tail -1 | cut --fields=1 --delimiter=' '`
-      - run: ci/test-eof-newline
-
-      - uses: camptocamp/initialise-gopass-summon-action@v1
+      - uses: camptocamp/initialise-gopass-summon-action@v2
         with:
           ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
           github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
+          patterns: docker
       - run: gpg --export-secret-keys --armor D121AF2DFA8E140688BD968930C9B913FD42EF13 > CI.asc
 
       - name: Install Cadastra fonts for OEREB example

.github/workflows/rebuild.yaml

@@ -11,21 +11,18 @@ jobs:
     timeout-minutes: 30
     name: Rebuild
 
-    env:
-      SUMMON_PROVIDER: /usr/local/bin/gopass
-
     strategy:
       fail-fast: false
       matrix:
         branch:
           - '3.25'
           - '3.24'
-          - 'master'
+          - master
 
     steps:
       - run: echo ${{ github.ref }}
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
         with:
           ref: ${{ matrix.branch }}
 
@@ -39,16 +36,22 @@ jobs:
         if: "startsWith(github.ref, 'refs/tags/')"
       - run: echo --${{ steps.tag2.outputs.replaced }}--
 
-      - run: git --no-pager diff --check `git log --oneline | tail -1 | cut --fields=1 --delimiter=' '`
-      - run: ci/test-eof-newline
-
-      - uses: camptocamp/initialise-gopass-summon-action@v1
+      - uses: camptocamp/initialise-gopass-summon-action@v2
         with:
           ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
           github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
+          patterns: docker
+
       - run: gpg --export-secret-keys --armor D121AF2DFA8E140688BD968930C9B913FD42EF13 > CI.asc
 
       - run: echo "enablePublishing=true" > gradle.properties
+
+      - run: |
+          sudo rm /etc/apt/sources.list.d/*.list
+          sudo apt update
+          sudo apt install --yes python3-wheel
+      - run: sudo python3 -m pip install --requirement=ci/requirements.txt
+
       - run: make build
 
       # Extract artifacts
@@ -79,14 +82,8 @@ jobs:
           path: /tmp/test_results
         if: failure()
 
-      - run: mkdir -p ~/.docker
-      - name: Decrypt secrets
-        run: summon --environment dockerhub bash -c 'envsubst < ci/docker-config.json.tmpl > ~/.docker/config.json'
-
-      - name: publish
-        run: ci/publish
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish
+        run: c2cciutils-publish --branch=${{matrix.branch}}
 
       - run: ./gradlew :core:libSourcesJar
         if: "startsWith(github.ref, 'refs/tags/')"

Makefile

@@ -2,7 +2,7 @@ GIT_HEAD_ARG = --build-arg=GIT_HEAD=$(shell git rev-parse HEAD)
 
 .PHONY: build
 build:
-	# Requred and not nesseerly exists
+	# Required and not nesseerly exists
 	touch CI.asc
 
 	docker build $(GIT_HEAD_ARG) --target=builder --tag=mapfish_print_builder .

SECURITY.md

@@ -11,3 +11,4 @@
 | 3.23    | 31/10/2021      |
 | 3.24    | 31/12/2021      |
 | 3.25    | 31/12/2021      |
+| 3.26    | 31/06/2021      |

ci/check-fonts

@@ -4,13 +4,13 @@ import requests
 
 
 def main():
-    responce = requests.get("http://localhost:8080/print/fonts")
+    response = requests.get("http://localhost:8080/print/fonts")
 
-    assert responce.ok, responce.status_code
-    assert (
-        responce.headers["Content-Type"] == "application/json;charset=utf-8"
-    ), responce.headers["Content-Type"]
-    fonts_result = responce.json()
+    assert response.ok, response.status_code
+    assert response.headers["Content-Type"] == "application/json;charset=utf-8", response.headers[
+        "Content-Type"
+    ]
+    fonts_result = response.json()
 
     fonts = [
         "DejaVu Sans",
@@ -55,9 +55,9 @@ def main():
     for font, fontconfig in fonts.items():
         font_result = [f for f in fonts_result["fonts"] if f["family"] == font]
         assert len(font_result) == 1
-        assert font_result[0]["fontconfig"] == fontconfig, "Invalid {}: ".format(
-            font
-        ) + str(font_result[0]["fontconfig"])
+        assert font_result[0]["fontconfig"] == fontconfig, "Invalid {}: ".format(font) + str(
+            font_result[0]["fontconfig"]
+        )
 
 
 if __name__ == "__main__":

ci/config.yaml

@@ -0,0 +1,15 @@
+version:
+  tag_to_version_re:
+    - from: release/([0-9]+\.[0-9]+\.[0-9]+)
+      to: \1
+
+checks:
+  codespell:
+    ignore_re:
+      - ^examples/src/test/resources/examples/.*
+      - ^examples/geoserver-data/.*
+      - ^core/src/test/java/org/mapfish/print/parser/MapfishParserTest\.java$
+      - ^core/src/test/resources/map-data/geojson/states\.json$
+      - ^core/src/test/resources/org/mapfish/print/parser/mapAttributeTest\.json$
+      - ^core/src/test/resources/map-data/openlayers/OpenLayers\.js$
+      - ^core/src/test/resources/map-data/geojson/ny-roads-3857\.json$