diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index 96820137..d6887467 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -7,7 +7,6 @@ on: - opened - reopened - edited - - closed jobs: check-version: @@ -16,25 +15,18 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Get default branch + - name: Print changed files run: | - DEFAULT_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') - echo "Default branch is: $DEFAULT_BRANCH" + echo "Changed files in this pull request:" + git show --name-only --pretty="" ${{ github.event.before }} ${{ github.sha }} - - name: Check version increment - run: | - # Print the list of all changed files for debugging - echo "All changed files in this pull request:" - git diff --name-only $DEFAULT_BRANCH HEAD - # Check if '_config.yml' was modified in this pull request - if git diff --name-only $DEFAULT_BRANCH HEAD | grep -q -E '^_config\.yml$'; then - # Print the changes in '_config.yml' for debugging + if git show --name-only --pretty="" ${{ github.event.before }} ${{ github.sha }} | grep -q -E '^_config\.yml$'; then echo "Changes in '_config.yml':" - git diff HEAD^..HEAD '_config.yml' - + git diff ${{ github.event.before }} ${{ github.sha }} '_config.yml' + # Check if the version was incremented - if git diff HEAD^..HEAD '_config.yml' | grep -E '^\+[[:space:]]+version:[[:space:]]+[0-9]+\.[0-9]+\.[0-9]+'; then + if git diff ${{ github.event.before }} ${{ github.sha }} '_config.yml' | grep -E '^\+[[:space:]]+version:[[:space:]]+[0-9]+\.[0-9]+\.[0-9]+'; then echo "Version incremented. Check passed." else echo "Error: Version in '_config.yml' was not incremented. Please update the version before merging." @@ -46,5 +38,3 @@ jobs: fi env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -