Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
mirzakaracic committed Dec 13, 2024
1 parent 285014f commit d9c20a4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
3 changes: 0 additions & 3 deletions .github/actions/fast-forward-merge/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ inputs:
base-branch:
description: Base branch
required: true
git-bot-token:
description: Git bot token
required: true

runs:
using: composite
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/promote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down

0 comments on commit d9c20a4

Please sign in to comment.