Merge branch 'beta' into dev

.github/workflows/ci-backend.yml

@@ -106,6 +106,7 @@ jobs:
           enable-cache: true
           python-version: ${{ steps.setup-python.outputs.python-version }}
       - name: Install system dependencies
+        timeout-minutes: 10
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends \

.github/workflows/ci-release.yml

@@ -23,7 +23,7 @@ jobs:
         uses: lewagon/wait-on-check-action@9312864dfbc9fd208e9c0417843430751c042800 # v1.7.0
         with:
           ref: ${{ github.sha }}
-          check-name: 'Build Docker Image'
+          check-name: 'Merge and Push Manifest'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 60
   build-release:
@@ -177,7 +177,7 @@ jobs:
           version: ${{ steps.get-version.outputs.version }}
           prerelease: ${{ steps.get-version.outputs.prerelease }}
           publish: true
-          commitish: main
+          commitish: ${{ steps.get-version.outputs.prerelease == 'true' && 'dev' || 'main' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload release archive