Skip to content

Commit

Permalink
Create new steps to merge with Github Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
LitaGarcia committed Jun 5, 2024
1 parent c3bd83d commit 01481b1
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions .github/workflows/generate-and-submit-documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,21 @@ jobs:
github_token: ${{ secrets.AUTHORIZATION_TOKEN }}
message: "Update documentation"

- name: Update develop branch
uses: michelmelo/[email protected]
with:
target_branch: 'fix/generate-documentation-workflow-test-merge'
from_branch: 'fix/generate-documentation-workflow'
user_email: github-actions[bot]@users.noreply.github.com
user_name: github-actions[bot]
github_token: ${{ secrets.PERSONAL_ACCESS_TOKEN_FINE_GRAINED }}
- name: Configure Git
run: |
git config --global user.name 'github-actions'
git config --global user.email '[email protected]'
- name: Fetch all branches
run: git fetch --all

- name: Checkout target branch
run: git checkout fix/generate-documentation-workflow-test-merge

- name: Merge source branch into target branch
run: git merge fix/generate-documentation-workflow --no-ff

- name: Push changes
env:
GITHUB_TOKEN: ${{ secrets.AUTHORIZATION_TOKEN }}
run: git push origin fix/generate-documentation-workflow-test-merge

0 comments on commit 01481b1

Please sign in to comment.