Merge branch 'master' into 'fb-dia-1748'

Workflow run: https://github.com/HumanSignal/Adala/actions/runs/12707896133

Author: niklub

.github/workflows/argocd-destroy.yml

@@ -122,7 +122,7 @@ jobs:
           BRANCH_NAME: ${{ github.event.pull_request.head.ref || github.ref_name }}
         run: |
           set -x
-          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed 's#/#-#g' | sed 's#_#-#g'| sed 's#\.#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25)"
+          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed -E 's#[/_\.-]+#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25 | sed -E 's#-$##g')"
           echo "pretty_branch_name=${pretty_branch_name}" >> "${GITHUB_OUTPUT}"
 
       - name: Delete ArgoCD App

.github/workflows/argocd-scaledown.yml

@@ -122,7 +122,7 @@ jobs:
           BRANCH_NAME: ${{ github.event.pull_request.head.ref || github.ref_name }}
         run: |
           set -x
-          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed 's#/#-#g' | sed 's#_#-#g'| sed 's#\.#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25)"
+          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed -E 's#[/_\.-]+#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25 | sed -E 's#-$##g')"
           echo "pretty_branch_name=${pretty_branch_name}" >> "${GITHUB_OUTPUT}"
 
       - name: Scaledown ArgoCD App

.github/workflows/docker-build.yml

@@ -63,8 +63,8 @@ jobs:
           BRANCH_NAME: ${{ inputs.branch_name }}
         run: |
           set -x
-          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed 's#/#-#g' | sed 's#_#-#g'| sed 's#\.#-#g' | tr '[:upper:]' '[:lower:]')"
-          echo "pretty_branch_name=$pretty_branch_name" >> $GITHUB_OUTPUT
+          pretty_branch_name="$(echo -n "${BRANCH_NAME#refs/heads/}" | sed -E 's#[/_\.-]+#-#g' | tr '[:upper:]' '[:lower:]' | cut -c1-25 | sed -E 's#-$##g')"
+          echo "pretty_branch_name=${pretty_branch_name}" >> "${GITHUB_OUTPUT}"
           current_time="$(date +'%Y%m%d.%H%M%S')"
           branch="-${pretty_branch_name}"
           short_sha="$(git rev-parse --short HEAD)"
@@ -76,29 +76,24 @@ jobs:
           echo "image_version=$version" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.7.1
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to DockerHub
         uses: docker/[email protected]
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Calculate Docker tags
-        id: calculate-docker-tags
-        uses: actions/github-script@v7
-        env:
-          TAGS: "${{ steps.version.outputs.image_version }},${{ steps.version.outputs.pretty_branch_name }}"
-          IMAGE_NAME: ${{ env.IMAGE_NAME }}
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
         with:
-          script: |
-            const raw_tags_input = process.env.TAGS;
-            const image_name = process.env.IMAGE_NAME;
-            
-            const tags = raw_tags_input.split(',').map(x => x.trim());
-            const docker_tags = tags.map(x => `${image_name}:${x}`).join(',');
-            console.log(docker_tags);
-            core.setOutput("docker-tags", docker_tags);
+          images: ${{ env.IMAGE_NAME }}
+          labels: |
+            org.opencontainers.image.revision=${{ inputs.sha }}
+          tags: |
+            type=raw,value=${{ steps.version.outputs.image_version }}
+            type=raw,value=${{ steps.version.outputs.pretty_branch_name }}
 
       - name: Push Docker image
         uses: docker/[email protected]
@@ -107,7 +102,11 @@ jobs:
           context: .
           file: Dockerfile.app
           push: ${{ steps.actor-membership.outputs.active }}
-          tags: ${{ steps.calculate-docker-tags.outputs.docker-tags }}
+          platforms: linux/amd64,linux/arm64
+          sbom: true
+          provenance: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 

.github/workflows/follow-merge-upstream-repo-sync.yml

@@ -142,13 +142,14 @@ jobs:
             This PR was automaticaly generated via Follow Merge. 
             Please ensure that all linked upstream Pull Requests are merged before proceeding with this one.
 
-      - name: Add PR Reviewers
-        uses: ./.github/actions-hub/actions/github-add-pull-request-reviewers
+      - name: Add PR Assignees
+        if: steps.fm.outputs.assignees
+        uses: ./.github/actions-hub/actions/github-add-pull-request-assignees
         continue-on-error: true
         with:
           github_token: ${{ secrets.GIT_PAT }}
           pullrequest_number: "${{ steps.get-pr.outputs.number }}"
-          reviewers: "${{ steps.fm.outputs.actor }}"
+          assignees: "${{ steps.fm.outputs.assignees }}"
 
       - name: Link PR
         uses: ./.github/actions-hub/actions/github-link-upstream-pull-request

.github/workflows/tests.yml

@@ -90,7 +90,7 @@ jobs:
           matrix.os == 'ubuntu-latest' &&
           matrix.python-version == '3.12' &&
           github.event.pull_request.user.login != 'dependabot[bot]'
-        uses: codecov/[email protected].1
+        uses: codecov/[email protected].2
         with:
           files: tests/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}