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.

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

ign -> gz: rename files, change directories, create symlinks #117

Merged
merged 3 commits into from
Aug 3, 2022

Conversation

j-rivero
Copy link
Contributor

@j-rivero j-rivero commented Aug 3, 2022

The PR replaces #109 and #112 and did three different changes:

  • 3af65ff Rename all files from ign- to gz-
  • 321e2d0 Added ign- symlinks for previous files
  • 8a96b7c Change the checkout directories from ign- to gz- to match software new names

Tested Build Status together with gazebo-tooling/release-tools#738

I was using the following commands:

# Rename files:
for f in $(ls ign-*.yaml); do git mv $f ${f/ign-/gz-}; done
for f in $(ls gz-gazebo*.yaml); do git mv $f ${f/gz-gazebo/gz-sim}; done
git ci --all -m "Rename files from ign- to gz-"
# symlinks for ignition
for f in $(ls gz-*.yaml); do ln -s $f ${f/gz-/ign-}; done
for f in $(ls ign-sim*.yaml); do mv $f ${f/ign-sim/ign-gazebo}; done
git add ign-*
git ci --all -m "Add ign- symlinks"
# Rename clone directories
sed -i 's/ign-\(.*\):/gz-\1:/g' collection-*.yaml gz-*.yaml sdformat-*.yaml
sed -i 's/gz-gazebo/gz-sim/g' collection-*.yaml gz-*.yaml

Caveats:

  • Although the symlinks are going to work on UNIX systems, Windows probably can no handle them correctly.
  • The checkout directory is changing from ign- to gz- for the files named ign- so not real backward compat is done
  • I'm maintaining the checkout directories for Gazebo Classic

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
This was referenced Aug 3, 2022
Copy link
Contributor

@chapulina chapulina left a comment

Choose a reason for hiding this comment

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

LGTM, so just to summarize the breaking changes as I understand them:

Broken:

Not broken:

  • Accessing specific files in UNIX after cloning gazebodistro, i.e. git clone ...gazebodistro; cat ign-gazebo6.yaml

I took a quick look at our docs and tooling, and I believe nothing will be affected by this besides Windows CI, which has a PR open to fix it. Most places are using the collection-X.yaml files and I don't think they're using the paths to each repo.

@j-rivero
Copy link
Contributor Author

j-rivero commented Aug 3, 2022

LGTM, so just to summarize the breaking changes as I understand them:

correct as far as I can tell.

I took a quick look at our docs and tooling, and I believe nothing will be affected by this besides Windows CI, which has a PR open to fix it. Most places are using the collection-X.yaml files and I don't think they're using the paths to each repo.

That is also my impression. Let's merge both PRs and fix anything that appear afterwards if any.

@chapulina
Copy link
Contributor

Ok, we have our first failure, Windows CI for ign-gazebo6:

C:\Jenkins\workspace\ign_gazebo-pr-win>for /F %i in ('python "C:\Jenkins\workspace\ign_gazebo-pr-win\scripts\jenkins-scripts\\tools\detect_cmake_major_version.py" "C:\Jenkins\workspace\ign_gazebo-pr-win\gz-sim\CMakeLists.txt"') do set IGN_MAJOR_VERSION=%i 
Traceback (most recent call last):
  File "C:\Jenkins\workspace\ign_gazebo-pr-win\scripts\jenkins-scripts\\tools\detect_cmake_major_version.py", line 11, in <module>
    f = open(fileName, 'r')
FileNotFoundError: [Errno 2] No such file or directory: 'C:\\Jenkins\\workspace\\ign_gazebo-pr-win\\gz-sim\\CMakeLists.txt'
7 was unexpected at this time.

https://build.osrfoundation.org/job/ign_gazebo-pr-win/4853/console

@j-rivero
Copy link
Contributor Author

j-rivero commented Aug 3, 2022

Ok, we have our first failure, Windows CI for ign-gazebo6:

Umm I thought I have changed the DSL code yesterday playing with the PRs in release-tools. Somehow the changes were not done, fixing it now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants