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

Gnome-Shell 43 compatibility update. #26

Closed
wants to merge 13 commits into from

Conversation

Fire-man-x
Copy link

Copy commit from paradoxxxzero/gnome-shell-system-monitor-applet
Close issue: paradoxxxzero#749 and paradoxxxzero#751.

mgalgs and others added 12 commits April 25, 2022 07:06
On first build it won't be present.
We're going to be uploading this to extensions.gnome.org, which means it
needs to have a different UUID from the upstream version. Append a -next to
ensure uniqueness.

Also update the description to clarify provenance.
Add a syncer action and associated workflow that periodically rebases this
fork with upstream and force pushes the result to our master branch.
Add an uploader action and associated workflow to package up and upload the
extension to extensions.gnome.org when a push to master touches the
extension code.

This works in tandem with the syncer action to continuously update the
extension on extensions.gnome.org with upstream's master branch.
When the rebase fails the repo ends up in a mangled state. For example,
.github/sync-failed-template.md might not even be present in the source
directory after the failed rebase, which causes the "create-an-issue"
action to fail.

Fix this by aborting the rebase on failure so that the source directory
gets back to a sane state.

Fixes: https://github.com/mgalgs/gnome-shell-system-monitor-applet/runs/4106665884

    Error: File .github/sync-failed-template.md could not be found in your
    project's workspace. You may need the actions/checkout action to clone
    the repository first.
We don't really need to sync every hour. Bump it to every 6 hours to save
the environment for posterity.

Fixes #24
Copy commit from  paradoxxxzero/gnome-shell-system-monitor-applet
Copy link

@knbknb knbknb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 1085 of file ./system-monitor@paradoxxx.zero.gmail.com/extension.js : Just by looking at the code: shouldn't be this operator => (fat arrow) be written as >= (greater than or equal)?

@mgalgs
Copy link
Owner

mgalgs commented Nov 1, 2022

line 1085 of file ./system-monitor@paradoxxx.zero.gmail.com/extension.js : Just by looking at the code: shouldn't be this operator => (fat arrow) be written as >= (greater than or equal)?

I had the same thought. Made a comment on the PR upstream.

@mgalgs
Copy link
Owner

mgalgs commented Nov 1, 2022

@Fire-man-x thanks for the fix. However, I want to see what upstream does with it before taking this change. If upstream remains unresponsive we can take this here, but I want to give them a few days at least.

paradoxxxzero#754

@sibradzic
Copy link

The fix works just fine. @mgalgs I agree that, normally, waiting for upstream is a right thing, but this particular upstream is known for the lack of responsiveness 🤷

@mgalgs
Copy link
Owner

mgalgs commented Nov 2, 2022

I'll merge it Friday if upstream still hasn't responded.

@ZimbiX
Copy link

ZimbiX commented Nov 3, 2022

As a matter of courtesy, you probably should have copied the commits in a way that kept their author as @glerroo so he keeps the credit, e.g. git cherry-pick <commit>

@Fire-man-x
Copy link
Author

@ZimbiX Ok, thanks for advice, next time I will know

@ixevix
Copy link

ixevix commented Nov 4, 2022

Nice work! Thanks!

@4javier
Copy link

4javier commented Nov 6, 2022

Keep in mind this little change in travis setup to avoid the same CI block of upstream.
paradoxxxzero#757
Gnome 43 landed into Arch Linux official repos, so I think it's just matter of little time to have it in other distros too.
I think it would be better to accept the PR here in the fork without waiting.

@mgalgs
Copy link
Owner

mgalgs commented Nov 6, 2022

All right, I've integrated the patches from the upstream PR (original authorship intact) and a new build has been submitted to extensions.gnome.org. Updates should be landing as soon as the Gnome team reviews the new submission (they're usually pretty quick, < 24 hours).

Thanks, @Fire-man-x, for the PR and everyone else for your input 🙏

@mgalgs
Copy link
Owner

mgalgs commented Nov 6, 2022

Fixes #25

Sign up for free to 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.

None yet

8 participants