Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollback debug
Browse files Browse the repository at this point in the history
paulstretenowich committed Nov 8, 2024
1 parent 1d5bb3b commit 05368e8
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/Update-Version-and-create-Realeases-PR.yml
Original file line number Diff line number Diff line change
@@ -30,8 +30,8 @@ jobs:
node-version: 18
- name: Setup Git
run: |
git config user.email "github-actions[bot]@users.noreply.github.com"
git config user.name "github-actions[bot]"
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Update the version
id: update_version
run: |
@@ -41,20 +41,6 @@ jobs:
run: |
npm install -g auto-changelog
auto-changelog -v ${{ steps.update_version.outputs.version }}
- name: Commit changes
run: |
git add pt_cli/__version__.py
git commit -m "Update version to ${{ inputs.version }}"
- name: Fetch and merge main
run: |
git fetch origin main
git merge origin/main --allow-unrelated-histories --strategy-option ours || true
- name: Resolve conflicts
if: failure()
run: |
git checkout --ours pt_cli/__version__.py
git add pt_cli/__version__.py
git commit -m "Resolved merge conflict in pt_cli/__version__.py"
- name: Create pull request
id: create_pr
uses: peter-evans/create-pull-request@v7

0 comments on commit 05368e8

Please sign in to comment.