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

Linux named notifications - 2-0-0 #12229

Merged
merged 4 commits into from Mar 13, 2018

Conversation

Projects
None yet
2 participants
@ckerr
Member

ckerr commented Mar 12, 2018

Cherry-picks the three sections of the linux notification cleanup:
5f48f91 bumps the docker images for libnotify in CI tests
86af20d is the main fix
dd2c266 handles an edge case and eliminates duplicate code

ckerr added some commits Mar 9, 2018

Newer CI images (#12188)
* Bump electronbuilds/electron* versions

The linux-appname branch has been gathering dust for awhile.
Some of the versions in `master` are higher, and some of the
versions in `linux-appname` are higher to add libnotify.

This commit takes the higher of the two numbers in each case.

* Add libnotify to the Dockerfiles
Linux named notifications (#12192)
* Set name & desktop-entry on Linux notifications

* DBusMock now honors verbose mode flag

* Disable DBus Notification tests on ia32
Fix desktop-id notification edge case (#12216)
* Fix desktop-id notification edge case

* Extract-method platform_util::GetDesktopName()

This removes duplicated code from libnotify_notifications.cc
and atom/common/linux/application_info.cc.

* Check for empty case in GetDesktopName().

* Move GetDesktopName() to brightray::util

* Remove unnecessary changes in platform_util

* Add a brightray::platform_util namespace

@ckerr ckerr requested review from electron/notifications as code owners Mar 12, 2018

@ckerr

This comment has been minimized.

Show comment
Hide comment
@ckerr

ckerr Mar 12, 2018

Member

The CI failure in macOS/pr-head is tracked at #12173

The CI failure in arm64/pr-head is tracked at #12233

Member

ckerr commented Mar 12, 2018

The CI failure in macOS/pr-head is tracked at #12173

The CI failure in arm64/pr-head is tracked at #12233

@codebytere

Given that the failures are flakes, this looks good to me

@ckerr ckerr merged commit 176abdb into 2-0-x Mar 13, 2018

9 of 10 checks passed

jenkins: arm64/pr-head This commit cannot be built
Details
WIP ready for review
Details
ci/circleci: electron-linux-arm Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-arm64-test Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-ia32 Your tests passed on CircleCI!
Details
ci/circleci: electron-linux-x64 Your tests passed on CircleCI!
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
jenkins: macOS/pr-head This commit looks good
Details

@ckerr ckerr deleted the linux-named-notifications_2-0-0 branch Mar 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment