normalize branch names for docker tags and actionliknt (#2651)

Co-authored-by: jasquat <[email protected]>

Author: jasquat

.github/workflows/build_docker_images.yml

@@ -31,7 +31,6 @@ on:
   push:
     branches:
       - main
-      - api-logs
     tags: [v*]
 
 jobs:
@@ -54,7 +53,6 @@ jobs:
     env:
       REGISTRY: ghcr.io
       IMAGE_NAME: ${{ matrix.image_name }}
-      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     permissions:
       contents: read
       packages: write
@@ -71,6 +69,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Normalize branch name
+        id: normalize_branch_name
+        run: |
+          BRANCH_NAME=$(echo "${{ github.ref_name }}" | tr '[:upper:]' '[:lower:]' | sed -r 's/[^a-z0-9]+/-/g' | sed -r 's/^-+|-+$//g')
+          echo "normalized_branch_name=$BRANCH_NAME" >> "$GITHUB_OUTPUT"
+
       - name: Get current date
         id: date
         run: echo "date=$(date -u +'%Y-%m-%d_%H-%M-%S')" >> "$GITHUB_OUTPUT"
@@ -84,7 +88,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           labels: |
             org.opencontainers.image.description=${{ matrix.description }}
-            org.opencontainers.image.version=${{ env.BRANCH_NAME }}-${{ steps.date.outputs.date }}-${{ steps.commit_sha.outputs.sha_short }}
+            org.opencontainers.image.version=${{ steps.normalize_branch_name.outputs.normalized_branch_name }}-${{ steps.date.outputs.date }}-${{ steps.commit_sha.outputs.sha_short }}
           tags: |
             type=raw,value=v1.0.0,enable=${{ github.ref_name == 'rebuild-v1.0.0' }}
             type=raw,value=latest,enable=${{ github.ref_name == 'rebuild-v1.0.0' }}
@@ -98,7 +102,7 @@ jobs:
         run: echo "$DOCKER_METADATA_OUTPUT_JSON" | jq '.labels' > version_info.json
       - name: Generate full image tag
         id: full_tag
-        run: echo "full_tag=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH_NAME }}-${{ steps.date.outputs.date }}-${{ steps.commit_sha.outputs.sha_short }}" >> "$GITHUB_OUTPUT"
+        run: echo "full_tag=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.normalize_branch_name.outputs.normalized_branch_name }}-${{ steps.date.outputs.date }}-${{ steps.commit_sha.outputs.sha_short }}" >> "$GITHUB_OUTPUT"
       - name: Build Docker image
         uses: docker/[email protected]
         with:
@@ -156,4 +160,3 @@ jobs:
           cache-to: type=gha,mode=max
       - name: Adding markdown
         run: echo 'TAGS ${{ steps.meta.outputs.tags }}' >> "$GITHUB_STEP_SUMMARY"
-

.github/workflows/common.yml

@@ -16,18 +16,18 @@ jobs:
     name: Build and publish Python 🐍 distributions 📦 to PyPI
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v6
-      with:
-        python-version: "3.12"
-    - name: Install pypa/build
-      run: pip install --constraint=.github/workflows/constraints.txt pip uv
-    - name: Build a binary wheel and a source tarball
-      run: uv build spiff-arena-common
-    - name: Publish distribution 📦 to PyPI
-      if: github.ref == 'refs/heads/main'
-      uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        username: __token__
-        password: ${{ secrets.COMMON_PYPI_KEY }}
+      - uses: actions/checkout@v6
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+      - name: Install pypa/build
+        run: pip install --constraint=.github/workflows/constraints.txt pip uv
+      - name: Build a binary wheel and a source tarball
+        run: uv build spiff-arena-common
+      - name: Publish distribution 📦 to PyPI
+        if: github.ref == 'refs/heads/main'
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.COMMON_PYPI_KEY }}

.github/workflows/e2e-tests.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Get SHA for workflow_run
         id: get_sha
         if: github.event_name == 'workflow_run'
-        run: echo "sha=${{ github.event.workflow_run.head_sha }}" >> $GITHUB_OUTPUT
+        run: echo "sha=${{ github.event.workflow_run.head_sha }}" >> "$GITHUB_OUTPUT"
 
       - name: Checkout
         uses: actions/checkout@v6