Get version informations from within the ODK image. #1011
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit:
1) adds a odk-info tool inside the ODK image, that shows the version of
the image (baked in at build time) and optionally the versions of the
most important tools and the Python packages;
2) amends the `odkversion` Makefile goal to show both the version of the
ODK that generated the Makefile ("ODK Makefile") *and* the version of
the ODK that is currently running ("ODK Image"), as well as the
version of the main tools (using the odk-info script).
addresses #791 (apart from the "link to documentation" bit, which I
believe is overkill anyway).
matentzn
previously approved these changes
Feb 29, 2024
|
I want to amend the |
Calling the odk-info script with a non-empty argument that does not match any of the three options it expects will get it stuck in an infinite loop. We need to catch any unexpected argument to avoid that.
Some of the tools for which we display version informations have rather lengthy version messages (especially the Scala-based tools), so we cut them down to just the version number.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
adds a
odk-infotool inside the ODK image, that shows the version of the image (baked in at build time) and optionally the versions of the most important tools and the Python packages;amends the
odkversionMakefile goal to show both the version of the ODK that generated the Makefile (“ODK Makefile”, as baked into the Makefile as seed time) and the version of the ODK that is currently running (“ODK Image”), as well as the version of the main tools (obtained from theodk-infoscript).addresses #791 (apart from the "link to documentation" bit, which I believe is overkill anyway).
With this PR, this is what the
odkversionoutput looks like:$ sh run.sh make odkversion ODK Makefile v1.5 ODK Image v1.5 ROBOT version 1.9.5 Ammonite REPL & Script-Runner, 2.5.9 DOSDP-Tools v0.19.3, scalaVersion: 2.13.8, sbtVersion: 1.6.2, gitCommit: 943fbcac7c4c6a3f76ff7e3625628f714c6eb6ad Konclude v0.7.0-1138 - 500e11d9 (Jun 19 2021) Jena v4.9.0 Relation-Graph v2.3.2, scalaVersion: 2.13.12, sbtVersion: 1.9.7, gitCommit: ee8b19f4b8a3b8316c2b19c33efa9459013973ee Ontology Access Kit v0.5.25