Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/version-bump-and-fast-forward-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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() }}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.amazon.ion</groupId>
<artifactId>ion-java</artifactId>
<version>1.9.7</version>
<version>1.9.8</version>
<packaging>bundle</packaging>
<!--No version bump-->
<name>${project.groupId}:${project.artifactId}</name>
Expand Down