diff --git a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml index 466834f3c6..f9c377c141 100644 --- a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml +++ b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml @@ -51,7 +51,7 @@ jobs: cd current_release/target echo "path=$(readlink -f $(ls *.jar))" >> $GITHUB_ENV echo "file_name=$(ls *.jar)" >> $GITHUB_ENV - echo "version_number=$(echo $(ls *.jar) | cut -d'-' -f3)" >> $GITHUB_ENV + cd .. && echo "version_number=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - name: Create new release id: create_new_release diff --git a/.github/workflows/version-bump-and-fast-forward-check.yml b/.github/workflows/version-bump-and-fast-forward-check.yml index 4929bee6fa..504988bc3c 100644 --- a/.github/workflows/version-bump-and-fast-forward-check.yml +++ b/.github/workflows/version-bump-and-fast-forward-check.yml @@ -59,7 +59,7 @@ jobs: - name: Access to the incoming release uses: actions/checkout@v3 with: - repository: linlin-s/ion-java + repository: amzn/ion-java ref: ${{ github.event.pull_request.head.sha }} path: ion-java-new @@ -72,7 +72,7 @@ jobs: - name: Check whether the incoming release is fast-forward compared to the last release run: | cd ion-java-new - if git merge-base --is-ancestor ${{env.last_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi + if git merge-base --is-ancestor ${{env.current_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi - name: comment if: ${{ success() }} diff --git a/pom.xml b/pom.xml index 67d83dc39a..096210c83d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 com.amazon.ion ion-java - 1.9.7 + 1.9.8 bundle ${project.groupId}:${project.artifactId}