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

Switch from Travis -> Github actions. (bp #948) #953

Merged
merged 1 commit into from
Jan 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2020

This is an automated backport of pull request #948 done by Mergify

Cherry-pick of dab7090 has failed:

On branch mergify/bp/rolling/pr-948
Your branch is up to date with 'origin/rolling'.

You are currently cherry-picking commit dab7090.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	new file:   .github/workflows/test.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by them: .travis.yml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the conflicts label Dec 17, 2020
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-953 December 17, 2020 17:34 Failure
@clalancette clalancette force-pushed the mergify/bp/rolling/pr-948 branch from 2a5e44f to 955025d Compare January 4, 2021 20:57
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-953 January 4, 2021 20:57 Failure
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-953 January 4, 2021 20:59 Failure
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-953 January 4, 2021 21:02 Failure
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)
@clalancette clalancette force-pushed the mergify/bp/rolling/pr-948 branch from e5289c5 to 83b7f33 Compare January 5, 2021 13:27
@mjcarroll mjcarroll had a problem deploying to ros2-documentation-pr-953 January 5, 2021 13:27 Failure
@clalancette
Copy link
Contributor

@maryaB-osr OK, this is happier now. Please take a look when you get a chance; once this is merged, I'll ask mergify to merge it onto the dashing, foxy, and rolling branches.

@maryaB-osr
Copy link
Contributor

@clalancette This is already a backport from the original #948 targeting rolling. I'm not sure why I didn't backport to the other branches from the original PR, maybe I was concerned there'd be an issue (and there was!). I'll add the backport label to this now so it'll open the PRs for foxy and dashing

@maryaB-osr maryaB-osr added the backport-all backport at reviewers discretion; from rolling to all versions label Jan 5, 2021
@maryaB-osr
Copy link
Contributor

Sorry I just realized I forgot to remove eloquent from the backport-all label. Once #987 is in I'll merge this

@maryaB-osr maryaB-osr merged commit 893694a into rolling Jan 5, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/rolling/pr-948 branch January 5, 2021 18:53
mergify bot added a commit that referenced this pull request Jan 5, 2021
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>
(cherry picked from commit 893694a)
mergify bot added a commit that referenced this pull request Jan 5, 2021
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>
(cherry picked from commit 893694a)
maryaB-osr pushed a commit that referenced this pull request Jan 5, 2021
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>
(cherry picked from commit 893694a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
maryaB-osr pushed a commit that referenced this pull request Jan 5, 2021
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>
(cherry picked from commit 893694a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
hazkaz pushed a commit to hazkaz/ros2_documentation that referenced this pull request Feb 8, 2021
* Instructions on how to resolve ros2/issues/953

On Mac you might encounter issues with qt5 while running rosdep. 
I Added instructions on how to resolve this.

* Update source/Troubleshooting/Installation-Troubleshooting.rst

Co-authored-by: Marya Belanger <[email protected]>

Co-authored-by: Marya Belanger <[email protected]>
tfoote pushed a commit that referenced this pull request Apr 4, 2023
Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>
tfoote added a commit that referenced this pull request Apr 4, 2023
* Switch to use new GA4 analytics tag (#3421)

The old one is being sunset and won't work for much longer

(cherry picked from commit ac56356)

# Conflicts:
#	conf.py

* Fixing merge failure by adding theme and theme options

Fixing syntax for backporting. We're using this theme so hopefully backporting the alternative settings will work too.

* add missing requirements for build

* Switch from Travis -> Github actions. (#948) (#953)

Signed-off-by: Chris Lalancette <[email protected]>
(cherry picked from commit dab7090
and commit 9289f21)

Co-authored-by: Chris Lalancette <[email protected]>

* add rtd theme requirement

Signed-off-by: Tully Foote <[email protected]>

---------

Signed-off-by: Tully Foote <[email protected]>
Co-authored-by: Tully Foote <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Chris Lalancette <[email protected]>
Co-authored-by: Tully Foote <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-all backport at reviewers discretion; from rolling to all versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants