diff --git a/.github/actions/fast-forward-merge/action.yaml b/.github/actions/fast-forward-merge/action.yaml index fc7e48ab9..a072a0af5 100644 --- a/.github/actions/fast-forward-merge/action.yaml +++ b/.github/actions/fast-forward-merge/action.yaml @@ -8,9 +8,6 @@ inputs: base-branch: description: Base branch required: true - git-bot-token: - description: Git bot token - required: true runs: using: composite diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml index 9d61bbfdb..91724b656 100644 --- a/.github/workflows/promote.yaml +++ b/.github/workflows/promote.yaml @@ -55,14 +55,13 @@ jobs: # Fetch the whole history to prevent unrelated history errors fetch-depth: "0" ref: ${{ inputs.base-branch }} - token: ${{ inputs.git-bot-token }} + token: ${{ secrets.CLIENT_BOT_PAT }} - name: Merge commit hash from source to target branch uses: ./github/actions/fast-forward-merge with: ref-to-merge: ${{ steps.get-commit-hash.outputs.commit-hash }} base-branch: ${{ inputs.target-branch }} - git-bot-token: ${{ secrets.CLIENT_BOT_PAT }} - name: Promote build run: |