diff --git a/.github/workflows/check-version.yml b/.github/workflows/check-version.yml index c051030..a9f6476 100644 --- a/.github/workflows/check-version.yml +++ b/.github/workflows/check-version.yml @@ -14,11 +14,11 @@ jobs: - name: Set OLD_VERSION from etc/config.xml if merge would modify it run: | - echo "OLD_VERSION=$(git log main.. --cherry -p -- etc/config.xml | grep '\-.\s*.\' | tr -d '\-[:blank:]\n' | sed -e 's/\(.*\)<\/version>/\1/')" >> $GITHUB_ENV + echo "OLD_VERSION=$(git log main..HEAD --cherry -p -- etc/config.xml | grep '\-.\s*.\' | tr -d '\-[:blank:]\n' | sed -e 's/\(.*\)<\/version>/\1/')" >> $GITHUB_ENV - name: Set NEW_VERSION from etc/config.xml if merge would modify it run: | - echo "NEW_VERSION=$(git log main.. --cherry -p -- etc/config.xml | grep '\+.\s*.\' | tr -d '+[:blank:]\n' | sed -e 's/\(.*\)<\/version>/\1/')" >> $GITHUB_ENV + echo "NEW_VERSION=$(git log main..HEAD --cherry -p -- etc/config.xml | grep '\+.\s*.\' | tr -d '+[:blank:]\n' | sed -e 's/\(.*\)<\/version>/\1/')" >> $GITHUB_ENV - name: Test that versions are not empty run: |