Merge branch 'main' into update-mediawiki-1.43

Author: AndrewKostka

.github/workflows/composer.test.yml

@@ -35,7 +35,7 @@ jobs:
       run: docker compose -f docker-compose.yml -f docker-compose.integration.yml up -d
 
     - name: Setup - Keep trying to install the DBs (try for 30 seconds)
-      uses: nick-invision/retry@v3.0.0
+      uses: nick-invision/retry@v3.0.2
       with:
         max_attempts: 30
         retry_wait_seconds: 1

.github/workflows/docker.build.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - 'main'
-    tags:
-      - '*'
   pull_request:
 
 jobs:
@@ -16,15 +14,20 @@ jobs:
         uses: actions/checkout@v4
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v5.5.1
+        uses: crazy-max/ghaction-docker-meta@v5.7.0
         with:
           images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=sha
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.3.0
+        uses: docker/setup-buildx-action@v3.11.1
       - name: Set up helmfile
-        uses: helmfile/helmfile-action@v1.9.1
+        uses: helmfile/helmfile-action@v2.0.4
+        with:
+          helmfile-version: 'v0.162.0'
+          helm-version: 'v3.12.2'
       - name: Cache Docker layers
         uses: actions/cache@v4
         with:
@@ -40,7 +43,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v5.3.0
+        uses: docker/build-push-action@v6.15.0
         with:
           context: .
           file: ./Dockerfile
@@ -50,37 +53,29 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-
-      - name: Check whether wbaas-deploy should be updated
-        id: update-check
-        run: |
-          if [[ "$GITHUB_REF" =~ ^refs/tags/.+$ ]]; then
-              echo "This is a tagged release, will try to create an update in wbaas-deploy."
-              echo "match=true" >> $GITHUB_OUTPUT
-          fi
       - name: Check out `wmde/wbaas-deploy` repository in staging child directory
-        if: steps.update-check.outputs.match == 'true'
+        if: github.event_name != 'pull_request'
         uses: actions/checkout@v4
         with:
           repository: wmde/wbaas-deploy
           path: ./repos/wbaas-deploy-staging
       - name: Check out `wmde/wbaas-deploy` repository in production child directory
-        if: steps.update-check.outputs.match == 'true'
+        if: github.event_name != 'pull_request'
         uses: actions/checkout@v4
         with:
           repository: wmde/wbaas-deploy
           path: ./repos/wbaas-deploy-production
       - name: Update values for local, staging and production
-        if: steps.update-check.outputs.match == 'true'
+        if: github.event_name != 'pull_request'
         id: update-values
         run: |
-          TAG="$GITHUB_REF_NAME"
+          TAG="$(echo ${{ steps.docker_meta.outputs.tags }} | cut -d':' -f2)"
           echo "tag=$TAG" >> $GITHUB_OUTPUT
           sed -i "/image:/{n;s/tag:.*/tag: $TAG/;}" ./repos/wbaas-deploy-staging/k8s/helmfile/env/local/api.values.yaml.gotmpl
           sed -i "/image:/{n;s/tag:.*/tag: $TAG/;}" ./repos/wbaas-deploy-staging/k8s/helmfile/env/staging/api.values.yaml.gotmpl
           sed -i "/image:/{n;s/tag:.*/tag: $TAG/;}" ./repos/wbaas-deploy-production/k8s/helmfile/env/production/api.values.yaml.gotmpl
       - name: Update argo values for local, staging and production
-        if: steps.update-check.outputs.match == 'true'
+        if: github.event_name != 'pull_request'
         id: update-argo-values
         run: |
           cd ./repos/wbaas-deploy-staging
@@ -92,18 +87,18 @@ jobs:
           cd ../wbaas-deploy-production
           ./bin/generate-values production api
       - name: Truncate commit message
-        if: steps.update-check.outputs.match == 'true'
+        if: github.event_name != 'pull_request'
         id: truncate-commit-message
         run: |
-          MSG=$(echo "${{ github.event.head_commit.message }}" | head -n 1)
+          MSG=$(git log -1 --pretty=format:%s)
           echo "msg=$MSG" >> $GITHUB_OUTPUT
       - name: Create Staging+Local Pull Request
-        uses: peter-evans/create-pull-request@v6
-        if: steps.update-check.outputs.match == 'true'
+        uses: peter-evans/create-pull-request@v7
+        if: github.event_name != 'pull_request'
         with:
           path: ./repos/wbaas-deploy-staging
-          commit-message: 'Staging+Local: Deploy new Platform API image ${{ steps.update-values.outputs.tag }}'
-          title: 'Staging+Local: Deploy new Platform API image ${{ steps.update-values.outputs.tag }}'
+          commit-message: 'Staging+Local: Deploy new Platform API image ${{ steps.docker_meta.outputs.tags }}'
+          title: 'Staging+Local: Deploy new Platform API image ${{ steps.docker_meta.outputs.tags }}'
           branch: deploy-to-staging-${{ steps.update-values.outputs.tag }}
           committer: wmdebot <github-bots@wikimedia.de>
           author: wmdebot <github-bots@wikimedia.de>
@@ -114,12 +109,12 @@ jobs:
 
             **Changes**: [${{ steps.truncate-commit-message.outputs.msg }}](https://github.com/wbstack/api/commit/${{ github.sha }})
       - name: Create Production Pull Request
-        uses: peter-evans/create-pull-request@v6
-        if: steps.update-check.outputs.match == 'true'
+        uses: peter-evans/create-pull-request@v7
+        if: github.event_name != 'pull_request'
         with:
           path: ./repos/wbaas-deploy-production
-          commit-message: 'Production: Deploy new Platform API image ${{ steps.update-values.outputs.tag }}'
-          title: 'Production: Deploy new Platform API image ${{ steps.update-values.outputs.tag }}'
+          commit-message: 'Production: Deploy new Platform API image ${{ steps.docker_meta.outputs.tags }}'
+          title: 'Production: Deploy new Platform API image ${{ steps.docker_meta.outputs.tags }}'
           branch: deploy-to-production-${{ steps.update-values.outputs.tag }}
           committer: wmdebot <github-bots@wikimedia.de>
           author: wmdebot <github-bots@wikimedia.de>