Skip to content

Temporal fix for cmake update - #428

Merged
Acuadros95 merged 6 commits into
galacticfrom
fix/cmake_depend
Nov 19, 2021
Merged

Temporal fix for cmake update#428
Acuadros95 merged 6 commits into
galacticfrom
fix/cmake_depend

Conversation

@Acuadros95

@Acuadros95Acuadros95 commented Nov 19, 2021

Copy link
Copy Markdown
Contributor

This fix should be removed when this issue is solved

@Acuadros95
Acuadros95 changed the base branch from main to galacticNovember 19, 2021 10:08
mergifyBotand others added 2 commits November 19, 2021 11:10
(cherry picked from commit a4c138e)
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9

Copy link
Copy Markdown
Member

This should target main right?

mergifyBotand others added 2 commits November 19, 2021 11:10
Signed-off-by: Joel Cao <joel.cao@oppo.com>
Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)
Co-authored-by: kneep <alvin.cao@gmail.com>
@pablogs9
pablogs9 changed the base branch from galactic to mainNovember 19, 2021 10:10
@Acuadros95
Acuadros95 changed the base branch from main to galacticNovember 19, 2021 10:13
@Acuadros95

Copy link
Copy Markdown
ContributorAuthor

@mergify backport main

@mergify

mergifyBot commented Nov 19, 2021

Copy link
Copy Markdown
Contributor

backport main

🟠 Waiting for conditions to match

Details
  • merged [:pushpin: backport requirement]

Hey, I reacted but my real name is @Mergifyio

@Acuadros95

Acuadros95 commented Nov 19, 2021

Copy link
Copy Markdown
ContributorAuthor

@Acuadros95
Acuadros95 merged commit fa579fd into galacticNov 19, 2021
@Acuadros95
Acuadros95 deleted the fix/cmake_depend branch November 19, 2021 10:57
mergifyBot added a commit that referenced this pull request Nov 19, 2021
* Update README.md (#386) (#388)
(cherry picked from commit a4c138e)
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
* Remove references to log4cxx (#389)
* Add android support config (#396) (#405)
Signed-off-by: Joel Cao <joel.cao@oppo.com>
Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)
Co-authored-by: kneep <alvin.cao@gmail.com>
* Temporal fix for cmake update
* Fix rebase
* Add fix to regular CI
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: kneep <alvin.cao@gmail.com>
(cherry picked from commit fa579fd)
@mergify

mergifyBot commented Nov 19, 2021

Copy link
Copy Markdown
Contributor

backport main

✅ Backports have been created

Details

Acuadros95 added a commit that referenced this pull request Nov 19, 2021
* Update README.md (#386) (#388)
(cherry picked from commit a4c138e)
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
* Remove references to log4cxx (#389)
* Add android support config (#396) (#405)
Signed-off-by: Joel Cao <joel.cao@oppo.com>
Co-authored-by: Joel Cao <joel.cao@oppo.com>
(cherry picked from commit 967e7ad)
Co-authored-by: kneep <alvin.cao@gmail.com>
* Temporal fix for cmake update
* Fix rebase
* Add fix to regular CI
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: kneep <alvin.cao@gmail.com>
(cherry picked from commit fa579fd)
Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
mergifyBot pushed a commit that referenced this pull request Nov 23, 2021
This reverts commit fa579fd.
(cherry picked from commit 92599b1)
Acuadros95 added a commit that referenced this pull request Nov 23, 2021
This reverts commit fa579fd.
(cherry picked from commit 92599b1)
Co-authored-by: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com>
Sign up for freeto 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

@Acuadros95@pablogs9