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

3 ➡️ 4 #101

Merged
merged 14 commits into from
Mar 19, 2021
Merged

3 ➡️ 4 #101

merged 14 commits into from
Mar 19, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-launch3 to main.

Branch comparison: main...ign-launch3

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

nkoenig and others added 13 commits December 10, 2020 08:12
* 3.1.0 release prep

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Added PR 68 to changelog

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Fix env parsing by placing it before executable parsing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add tests to #81 (#82)

This adds a simple check to verify that the env directives apply
to everything in the ignition namespace, as fixed in #81.

The test itself is a bit of a workaround. We don't have a mechanism
for checking the manager output, and executable command directives
cannot expand environment variables.

This writes a script that is executed by the test to verify that a
file specified by an environment variable is touch-ed

Signed-off-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
* Fix env parsing by placing it before executable parsing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add tests to #81 (#82)

This adds a simple check to verify that the env directives apply
to everything in the ignition namespace, as fixed in #81.

The test itself is a bit of a workaround. We don't have a mechanism
for checking the manager output, and executable command directives
cannot expand environment variables.

This writes a script that is executed by the test to verify that a
file specified by an environment variable is touch-ed

Signed-off-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
* Fix env parsing by placing it before executable parsing (#81)

* Fix env parsing by placing it before executable parsing

Signed-off-by: Nate Koenig <nate@openrobotics.org>

* Add tests to #81 (#82)

This adds a simple check to verify that the env directives apply
to everything in the ignition namespace, as fixed in #81.

The test itself is a bit of a workaround. We don't have a mechanism
for checking the manager output, and executable command directives
cannot expand environment variables.

This writes a script that is executed by the test to verify that a
file specified by an environment variable is touch-ed

Signed-off-by: Michael Carroll <michael@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>

* Prep for 2.2.1 release (#84)

Signed-off-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>

Co-authored-by: Nate Koenig <nate@openrobotics.org>
Co-authored-by: Michael Carroll <michael@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from nkoenig as a code owner March 18, 2021 02:36
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label Mar 18, 2021
@chapulina chapulina added beta Targeting beta release of upcoming collection and removed 🏢 edifice Ignition Edifice labels Mar 18, 2021
@codecov
Copy link

codecov bot commented Mar 18, 2021

Codecov Report

Merging #101 (a551438) into main (1b49c1d) will increase coverage by 1.22%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #101      +/-   ##
==========================================
+ Coverage   29.01%   30.24%   +1.22%     
==========================================
  Files           3        3              
  Lines         734      734              
==========================================
+ Hits          213      222       +9     
+ Misses        521      512       -9     
Impacted Files Coverage Δ
src/Manager.cc 56.01% <100.00%> (+2.84%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1b49c1d...a551438. Read the comment docs.

@chapulina chapulina added the 🏢 edifice Ignition Edifice label Mar 18, 2021
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

There are 3 new warnings in the buildfarm https://build.osrfoundation.org/job/ignition_launch-ci-pr_any-ubuntu_auto-amd64/387/ but I think they are coming from other packages.

@adlarkin
Copy link
Contributor

There are some references to master in bitbucket-pipelines.yml that can be updated:

bitbucket-pipelines.yml:78:          - git clone https://github.com/ignitionrobotics/ign-rendering -b master
bitbucket-pipelines.yml:100:          - git clone https://github.com/ignitionrobotics/ign-gui -b master
bitbucket-pipelines.yml:114:          # - git clone https://github.com/ignitionrobotics/ign-physics -b master

There's also a reference to ign-launch3:

$ git grep -in launch3
plugins/websocket_server/WebsocketServer.hh:133:    /// 3. Open the [index.html](https://github.com/ignitionrobotics/ign-launch/blob/ign-launch3/plugins/websocket_server/index.html) webpage.

Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Addressed @adlarkin 's comments and force-pushed.

@chapulina chapulina enabled auto-merge March 19, 2021 00:58
@chapulina chapulina merged commit 8bdf0f6 into main Mar 19, 2021
@chapulina chapulina deleted the chapulina/3_to_4 branch March 19, 2021 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants