Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(docker): Use the output of printSemVersion as ORT_VERSION #7622

Closed
wants to merge 1 commit into from
Closed

chore(docker): Use the output of printSemVersion as ORT_VERSION #7622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-ort-runtime-ext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:

- name: Get ORT current version
run: |
ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p")
ORT_VERSION=$(./gradlew -q printSemVersion)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that when being exactly on tag 2.0.0 (with a clean working tree), this would print 2.0.0+sha.5893bd7 instead of 2.0.0. Is this desired?

Copy link
Member Author

@fviernau fviernau Oct 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware of that, but I think it's fine. I'd be fine if this logic was improved later on to only print 2.0.0 in that case. Do you agree?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be a mismatch, however, for people running ORT also from the distribution archive, which shows 2.0.0 in this case. I'll look into customizing the version format to address that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we merge now this and then customize the version format in that gradle tasks later on?

Copy link
Member

@sschuberth sschuberth Oct 4, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My alternative proposal is already here. That could be used instead of this PR (not in addition to it). The advantage is that also non-Docker user would get the SHA1 info for pre-release builds.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can minimize it direct in the tagging, i can capture the sha without need to alter the current Gradle process.
But will solve only for the images in upstream, not the local build script/.

echo "ORT_VERSION=${ORT_VERSION}" >> $GITHUB_ENV

- name: Set up Docker build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-ort-runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ jobs:

- name: Get ORT current version
run: |
ORT_VERSION=$(./gradlew -q properties --property version | sed -nr "s/version: (.+)/\1/p")
ORT_VERSION=$(./gradlew -q printSemVersion)
echo "ORT_VERSION=${ORT_VERSION}" >> $GITHUB_ENV

- name: Set up Docker build
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
set -e -o pipefail

GIT_ROOT=$(git rev-parse --show-toplevel)
ORT_VERSION=$("$GIT_ROOT/gradlew" -q properties --property version | sed -nr "s/version: (.+)/\1/p")
ORT_VERSION=$("$GIT_ROOT/gradlew" -q printSemVersion)
DOCKER_IMAGE_ROOT="${DOCKER_IMAGE_ROOT:-ghcr.io/oss-review-toolkit}"

echo "Setting ORT_VERSION to $ORT_VERSION."
Expand Down