ign-tools auto version #706
Closed
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
Signed-off-by: Louise Poubel <louise@openrobotics.org>
This was referenced Apr 15, 2022
scpeters
reviewed
Apr 15, 2022
| if "%COLCON_AUTO_MAJOR_VERSION%" == "true" ( | ||
| for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set PKG_MAJOR_VERSION=%%i | ||
| for /f %%i in ('python "%SCRIPT_DIR%\tools\detect_cmake_major_version.py" "%WORKSPACE%\%VCS_DIRECTORY%\CMakeLists.txt"') do set PKG_MAJOR_VERSION=%%i | ||
| if "%COLCON_AUTO_MAJOR_VERSION%" == "true" || "%PKG_MAJOR_VERSION%" != "1" ( | ||
| set COLCON_PACKAGE=%COLCON_PACKAGE%!PKG_MAJOR_VERSION! |
There was a problem hiding this comment.
maybe the problem is this line? perhaps we should be trying to detect the cmake project name rather than the major version?
There was a problem hiding this comment.
I was trying to keep this generic, but in the end of the day this logic seems like it's here only for ign-tools, so we could hardcode the name here. Is this what you mean?
|
the underlying issue has already been fixed by #713 |
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.
I broke CI for
ign-tools1on #702 because now the package ends up beingignition-tools1when it should beignition-tools.I moved the logic around to support this specific use case. The
COLCON_AUTO_MAJOR_VERSIONvariable's meaning is a bit changed now, but grepping through the code it looks likeign-toolsis the only one setting it to false anyway.I don't know if the syntax is correct 🙃
Test builds:
ign-tools1:ign-tools2: