diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 349748c..5b4c7e0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy on: push: tags: - - 'v*' + - '*' permissions: id-token: write # This is required for requesting the JWT diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d503a6..0856d29 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,6 @@ name: create release run-name: "Release ${{ inputs.releaseversion }}" -env: - IMAGE_NAME_DB: "msamt-online/db" - REGISTRY: "ghcr.io/bungeberatung" - on: workflow_dispatch: inputs: @@ -82,6 +78,7 @@ jobs: committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> branch: release/${{ inputs.releaseversion }} + base: develop delete-branch: true title: '[Release] ${{ inputs.releaseversion }}' body: |