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

2 to 3 #173

Merged
merged 12 commits into from
May 24, 2021
Merged

2 to 3 #173

merged 12 commits into from
May 24, 2021

Conversation

adlarkin
Copy link
Contributor

@adlarkin adlarkin commented May 14, 2021

➡️ Forward port

Port ign-cmake2 to main

Branch comparison: main...ign-cmake2

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

chapulina and others added 11 commits March 8, 2021 16:16
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* Find Ogre 2-2

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
* Port codecov to new configuration

See gazebo-tooling/action-gz-ci#32

Signed-off-by: Jose Luis Rivero <[email protected]>

* no codecov support in this repo
@adlarkin adlarkin requested a review from chapulina May 14, 2021 18:59
@adlarkin adlarkin requested review from j-rivero and mxgrey as code owners May 14, 2021 18:59
@github-actions github-actions bot added 🏢 edifice Ignition Edifice 🏯 fortress Ignition Fortress 🏰 citadel Ignition Citadel 🔮 dome Ignition Dome labels May 14, 2021
@adlarkin adlarkin changed the base branch from ign-cmake2 to main May 14, 2021 19:04
CMakeLists.txt Outdated Show resolved Hide resolved
tools/doc_check.sh Outdated Show resolved Hide resolved
@adlarkin adlarkin force-pushed the adlarkin/2_to_3 branch 2 times, most recently from 3895ff9 to 0ebefaa Compare May 21, 2021 16:25
adlarkin added a commit that referenced this pull request May 21, 2021
Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
@adlarkin
Copy link
Contributor Author

I resolved a few conflicts related to #169. As discussed in #170 (comment), we are disabling codecov in this repository, and as mentioned in #173 (comment), we should be using either the boinic or focal branches for actions-ignition-ci.

@j-rivero, mind taking one last look at this before I merge?

@adlarkin adlarkin merged commit db4901c into main May 24, 2021
@adlarkin adlarkin deleted the adlarkin/2_to_3 branch May 24, 2021 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏰 citadel Ignition Citadel 🔮 dome Ignition Dome 🏢 edifice Ignition Edifice 🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants