Skip to content

Commit

Permalink
see if this works
Browse files Browse the repository at this point in the history
  • Loading branch information
tmclaugh committed Sep 2, 2024
1 parent 069e643 commit b7e9236
Showing 1 changed file with 15 additions and 2 deletions.
17 changes: 15 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,26 @@ jobs:
- name: Checkout source
id: checkout-source
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Merge branch
id: merge-branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
echo "Configuring git"
git config user.name "GitHub Actions"
git config user.email "<>"
git branch -v
git log
echo "Checking out branch"
git fetch origin v1
git checkout v1
git reset --hard v1
echo "Merging branch"
git merge --no-ff $GITHUB_REF
echo "Pushing branch"
git push origin v1

0 comments on commit b7e9236

Please sign in to comment.