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

Bumps in garden : ign-garden #3

Closed
wants to merge 1 commit into from
Closed

Bumps in garden : ign-garden #3

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
10 changes: 5 additions & 5 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
libignition-cmake2-dev
libignition-common4-dev
libignition-fuel-tools7-dev
libignition-gazebo6-dev
libignition-gui6-dev
libignition-launch5-dev
libignition-gazebo7-dev
libignition-gui7-dev
libignition-launch6-dev
libignition-math6-dev
libignition-math6-eigen3-dev
libignition-msgs8-dev
libignition-physics5-dev
libignition-plugin-dev
libignition-rendering6-dev
libignition-sensors6-dev
libignition-rendering7-dev
libignition-sensors7-dev
libignition-tools-dev
libignition-transport11-dev
libsdformat12-dev
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ ign_configure_project(VERSION_SUFFIX pre1)

ign_find_package(ignition-common4 REQUIRED VERSION 4.3)
ign_find_package(ignition-fuel_tools7 REQUIRED)
ign_find_package(ignition-gazebo6 REQUIRED)
ign_find_package(ignition-gui6 REQUIRED)
ign_find_package(ignition-launch5 REQUIRED)
ign_find_package(ignition-gazebo7 REQUIRED)
ign_find_package(ignition-gui7 REQUIRED)
ign_find_package(ignition-launch6 REQUIRED)
ign_find_package(ignition-math6 REQUIRED COMPONENTS eigen3 VERSION 6.9)
ign_find_package(ignition-msgs8 REQUIRED)
ign_find_package(ignition-physics5 REQUIRED)
ign_find_package(ignition-plugin1 REQUIRED VERSION 1.2.1)
ign_find_package(ignition-rendering6 REQUIRED VERSION 6.0.1)
ign_find_package(ignition-sensors6 REQUIRED)
ign_find_package(ignition-rendering7 REQUIRED VERSION 6.0.1)
ign_find_package(ignition-sensors7 REQUIRED)
ign_find_package(ignition-tools REQUIRED VERSION 1.3)
ign_find_package(ignition-transport11 REQUIRED)
ign_find_package(ignition-utils1 REQUIRED VERSION 1.1)
Expand Down
10 changes: 5 additions & 5 deletions gazebodistro/collection-garden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ repositories:
ign-gazebo:
type: git
url: https://github.com/ignitionrobotics/ign-gazebo
version: ign-gazebo6
version: ign-gazebo7
Copy link
Contributor

Choose a reason for hiding this comment

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

These could be main, but I think this file isn't used for anything, so this should be ok

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll try to see where this happens in bump_dependency.bash...

Copy link
Contributor

Choose a reason for hiding this comment

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

It's a blind search-and-replace. I don't think it's worth "fixing"... We often forget to flip from main to release branches after the official release, so maybe it's good to be this way from the start

Copy link
Member Author

Choose a reason for hiding this comment

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

the homebrew formula test checks that all the branches exist: https://github.com/osrf/homebrew-simulation/blob/master/Formula/ignition-garden.rb#L55-L58

so that may fail until we create the release branches

Copy link
Contributor

Choose a reason for hiding this comment

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

Ahh gotcha, yeah then we need to fix this

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm going to close this and test an improved script to see if that can get it right

ign-gui:
type: git
url: https://github.com/ignitionrobotics/ign-gui
version: ign-gui6
version: ign-gui7
ign-launch:
type: git
url: https://github.com/ignitionrobotics/ign-launch
version: ign-launch5
version: ign-launch6
ign-math:
type: git
url: https://github.com/ignitionrobotics/ign-math
Expand All @@ -43,11 +43,11 @@ repositories:
ign-rendering:
type: git
url: https://github.com/ignitionrobotics/ign-rendering
version: ign-rendering6
version: ign-rendering7
ign-sensors:
type: git
url: https://github.com/ignitionrobotics/ign-sensors
version: ign-sensors6
version: ign-sensors7
ign-tools:
type: git
url: https://github.com/ignitionrobotics/ign-tools
Expand Down