Skip to content

Commit

Permalink
test difference between branches
Browse files Browse the repository at this point in the history
  • Loading branch information
ClaudiaComito committed Aug 2, 2023
1 parent 7654424 commit 59ee4e9
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/merge-release-changes-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
run: |
git checkout -b ${{ env.working_branch }} ${{ env.starting_branch }}
git push --set-upstream origin ${{ env.working_branch }}
- name: Check for differences between release and main
run: |
git fetch origin ${{ env.base_branch }}
DIFF=$(git log origin/${{ env.base_branch }}..${{ env.working_branch }})
if [ -z "$DIFF" ]; then
echo "No differences found. Exiting without creating a pull request."
exit 0
fi
# - name: Check for differences between release and main
# run: |
# git fetch origin ${{ env.base_branch }}
# DIFF=$(git log origin/${{ env.base_branch }}..${{ env.working_branch }})
# if [ -z "$DIFF" ]; then
# echo "No differences found. Exiting without creating a pull request."
# exit 0
# fi
- name: Create a pull request
uses: peter-evans/create-pull-request@v4
with:
Expand Down

0 comments on commit 59ee4e9

Please sign in to comment.