Merge remote-tracking branch 'origin/prod-2-8-advance' into prod-2-9-…

…advance

.github/ci-upgrade.yaml

@@ -0,0 +1,7 @@
+disabled:
+  - update-audit-workflow
+  - update-changelog-workflow
+  - update-clean-workflow
+  - update-pull-request-checks-workflow
+  - update-delete-old-workflow-run-workflow
+  - update-config

.github/workflows/backport.yaml

@@ -1,4 +1,3 @@
----
 name: Backport
 
 on:

.github/workflows/main.yaml

@@ -1,4 +1,3 @@
----
 name: Continuous integration
 
 on:
@@ -12,13 +11,13 @@ env:
 
 jobs:
   main:
-    runs-on: ubuntu-20.04
     name: Continuous integration
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: camptocamp/demo_geomapfish_data
           ref: master
@@ -34,8 +33,7 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
 
-      - run: cp env.acceptance-test env.secrets
-      - run: sed -i '/^DOCKER_TAG=/d' env.project
+      - run: touch env.secrets
 
       - name: Checks
         run: c2cciutils-checks
@@ -60,7 +58,9 @@ jobs:
       - run: c2cciutils-docker-logs
         if: always()
 
-      - run: docker-compose --file=docker-compose.yaml --file=docker-compose-db.yaml --file=docker-compose.override.sample.yaml up -d
+      - run:
+          docker compose --file=docker-compose.yaml --file=docker-compose-db.yaml --file=docker-compose.override.sample.yaml
+          up -d
       - name: Run the acceptance tests on dev
         run: make acceptance
       - run: c2cciutils-docker-logs
@@ -84,3 +84,11 @@ jobs:
       #   with:
       #     environment: ${{ env.SENTRY_ENVIRONMENT }}
       #   if: github.ref == 'refs/heads/prod-2-8'
+      - run: git diff --exit-code --patch > /tmp/dpkg-versions.patch || true
+        if: failure()
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Update dpkg versions list.patch
+          path: /tmp/dpkg-versions.patch
+          retention-days: 1
+        if: failure()

.github/workflows/pull-request-automation.yaml

@@ -0,0 +1,51 @@
+name: Auto reviews, merge and close pull requests
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+
+jobs:
+  auto-merge:
+    name: Auto reviews pull requests from bots
+    runs-on: ubuntu-22.04
+    timeout-minutes: 5
+
+    steps:
+      - name: Print event
+        run: echo "${GITHUB}" | jq
+        env:
+          GITHUB: ${{ toJson(github) }}
+      - name: Print context
+        uses: actions/github-script@v7
+        with:
+          script: |-
+            console.log(context);
+      - name: Auto reviews GHCI updates
+        uses: actions/github-script@v7
+        with:
+          script: |-
+            github.rest.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              event: 'APPROVE',
+            })
+        if: |-
+          startsWith(github.head_ref, 'ghci/audit/')
+          && (github.event.pull_request.user.login == 'geo-ghci-test[bot]'
+            || github.event.pull_request.user.login == 'geo-ghci-int[bot]'
+            || github.event.pull_request.user.login == 'geo-ghci[bot]')
+      - name: Auto reviews Renovate updates
+        uses: actions/github-script@v7
+        with:
+          script: |-
+            github.rest.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.payload.pull_request.number,
+              event: 'APPROVE',
+            })
+        if: |-
+          github.event.pull_request.user.login == 'renovate[bot]'

.github/workflows/update_l10n.yaml

@@ -1,4 +1,3 @@
----
 name: Update l10n cron job
 
 on:
@@ -15,15 +14,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - branch: prod-2-7
-            base_url: https://geomapfish-demo-2-7.camptocamp.com/
+          - branch: int-2-8
+            base_url: int.customer.ch
           - branch: prod-2-8
-            base_url: https://geomapfish-demo-2-8.camptocamp.com/
-          - branch: prod-2-9
-            base_url: https://geomapfish-demo-2-8.camptocamp.com/
+            base_url: prod.customer.ch
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
           token: ${{ secrets.GOPASS_CI_GITHUB_TOKEN }}