Merge branch 'master' into prerelease_add

eBay · Mar 8, 2024 · fe7b816 · fe7b816
2 parents f3f9bd3 + a866e0b
commit fe7b816
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/blank.yml → .github/workflows/version_change_check.yml b/.github/workflows/blank.yml → .github/workflows/version_change_check.yml
@@ -15,7 +15,9 @@ jobs:
       - name: Check if file is modified
         run: |
           if [[ $(git diff --name-only ${{ github.base_ref }}..${{ github.sha }}) == *conanfile.py* ]]; then
-            echo "File is modified"
+          if git diff --unified=0 ${{ github.base_ref }}..${{ github.sha }} *conanfile.py* | grep -q "^+.*version"; then
+            echo "Version is updated with this PR, OK"
           else
-            echo "File is not modified"
+            echo "Conan version is not updated with this PR. Please update that to allow PR merge"
+            exit 1
           fi