diff --git a/.github/workflows/picocli-logback-level-mixin.yaml b/.github/workflows/picocli-logback-level-mixin.yaml index 705b873..4ca1d96 100644 --- a/.github/workflows/picocli-logback-level-mixin.yaml +++ b/.github/workflows/picocli-logback-level-mixin.yaml @@ -39,10 +39,11 @@ jobs: # - run: 'git fetch origin ${{ github.event.pull_request.base.ref }}' - id: compare run: | + file=${{ env.GRADLE_SUBPROJECT_DIR }}/version.txt # Get version from target branch - TARGET_VERSION=$(git show origin/${{ github.event.pull_request.base.ref }}:${{ env.GRADLE_SUBPROJECT_DIR }}/version.txt) + TARGET_VERSION=$(git show ${{ github.event.before }}:${file}) # Get version from PR branch - CURRENT_VERSION=$(cat ${{ env.GRADLE_SUBPROJECT_DIR }}/version.txt) + CURRENT_VERSION=$(git show ${{ github.sha }}:${file}) echo "Target branch version: ${TARGET_VERSION}" echo "Current PR version: ${CURRENT_VERSION}" diff --git a/lib/picocli-logback-level-mixin/version.txt b/lib/picocli-logback-level-mixin/version.txt index 3373302..cfefe08 100644 --- a/lib/picocli-logback-level-mixin/version.txt +++ b/lib/picocli-logback-level-mixin/version.txt @@ -1 +1 @@ -0.0.2-SNAPSHOT +0.0.1-SNAPSHOT