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

Merge ign-common3 ➡️ ign-common4 #559

Merged
merged 7 commits into from
Dec 15, 2023
Merged

Merge ign-common3 ➡️ ign-common4 #559

merged 7 commits into from
Dec 15, 2023

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Nov 13, 2023

➡️ Forward port

Port ign-common3 ➡️ ign-common4

Branch comparison: ign-common4...ign-common3

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

zaidhaan and others added 5 commits May 22, 2023 08:42
Signed-off-by: Angelo Elias Dal Zotto <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* fix: Don't recursively call init if log directories can not be created.

If there is no permission to create the log directories, the FileLogger
will call itself recutsive, as is used ignerr for logging the error,
which will call FileLogger::Init again.

This commit fixed this, by using std::cerr for the log output in
FileLogger::Init.


Signed-off-by: Janosch Machowinski <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey requested a review from marcoag as a code owner November 13, 2023 23:17
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Nov 13, 2023
@azeey azeey requested a review from mjcarroll December 12, 2023 21:51
@azeey
Copy link
Contributor Author

azeey commented Dec 13, 2023

@osrf-jenkins run tests please

Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey
Copy link
Contributor Author

azeey commented Dec 13, 2023

Included #561 to fix test failures.

@azeey
Copy link
Contributor Author

azeey commented Dec 14, 2023

@osrf-jenkins run tests please

@mjcarroll
Copy link
Contributor

Windows build is a test that is timing-sensitive, homebrew is an existing deprecation message (we could consider disabling it).

So this is actually green.

@azeey azeey merged commit 98fce61 into ign-common4 Dec 15, 2023
8 of 10 checks passed
@azeey azeey deleted the azeey/3_to_4 branch December 15, 2023 00:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants