diff --git a/CHANGELOG.md b/CHANGELOG.md index 201e159..652b018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [0.9.0] + - Use working-directory when evaluating version of main branch + ## [0.8.0] - Better evaluate version of main branch diff --git a/VERSION b/VERSION index 8adc70f..899f24f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.0 \ No newline at end of file +0.9.0 \ No newline at end of file diff --git a/actions/npm/validate-pr-version/action.yml b/actions/npm/validate-pr-version/action.yml index 87a2910..8df11d1 100644 --- a/actions/npm/validate-pr-version/action.yml +++ b/actions/npm/validate-pr-version/action.yml @@ -30,8 +30,8 @@ runs: fi BASE_BRANCH="${{ github.event.pull_request.base.ref }}" - - MAIN_VERSION=$(git show "$BASE_BRANCH:$PACKAGE_JSON" | jq -r '.version') + WORKDIR="${{ inputs.working-directory }}" + MAIN_VERSION=$(git show "origin/$BASE_BRANCH:$WORKDIR/$PACKAGE_JSON" | jq -r '.version') PR_VERSION=$(jq -r '.version' "$PACKAGE_JSON") echo "Main version: $MAIN_VERSION"