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

Update 4.4.0.58→4.4.0.64 & unify formatting #87

Merged
merged 2 commits into from Jul 7, 2022

Conversation

Olf0
Copy link
Contributor

@Olf0 Olf0 commented Jun 5, 2022

@CLAassistant
Copy link

CLAassistant commented Jun 5, 2022

CLA assistant check
All committers have signed the CLA.

@Olf0
Copy link
Contributor Author

Olf0 commented Jun 6, 2022

Motivation

The fact that only SailfishOS 4.4.0.58 is listed as a stop release, but not 4.4.0.64 has already created confusion at FSO, even though the release note are quite clear in my understanding: https://forum.sailfishos.org/t/release-notes-vanha-rauma-4-4-0/10656#update-version-history-1

License

This contribution is submitted in accordance to the CC-BY-NC-SA 4.0 license, as noted at Releases|Sailfish OS Documentation (https://docs.sailfishos.org/Releases/) on 2022-06-06.

CLA / CLA needs fixing!

Hence please consider using the contributor-assistant/github-action instead, which provides these advantages (compared to the technically dreaded "CLA assistant"):

  • decentralizing the database of contributors
  • fully integrated with github environment
  • no UI is required
  • no need to grant any permission/scope

Releases/README.md Outdated Show resolved Hide resolved
Releases/README.md Outdated Show resolved Hide resolved
Copy link
Member

@llewelld llewelld left a comment

Choose a reason for hiding this comment

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

The changes here look good to me. There is the issue of alignment highlighted by @rainemak, which it would be nice to have fixed, but given this is an existing glitch my personal feeling, in the interests of moving things forward, is that we could do it as a separate commit afterwards.

@rainemak
Copy link
Member

The changes here look good to me. There is the issue of alignment highlighted by @rainemak, which it would be nice to have fixed, but given this is an existing glitch my personal feeling, in the interests of moving things forward, is that we could do it as a separate commit afterwards.

Separate commit works for me. Could you @Olf0 rebase this one?

@llewelld
Copy link
Member

Hence please consider using the contributor-assistant/github-action instead

Thanks for flagging up these issues with the CLA @Olf0, and sorry that you experienced issues. I've logged an internal issue about it, including your suggestion to use contributor-assistant/github-action instead. That doesn't guarantee it'll get changed, but at least increases the chance it'll get properly looked at.

… preceding some code names and add the corresponding number of space characters after these code names, etc.
Copy link
Member

@llewelld llewelld left a comment

Choose a reason for hiding this comment

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

Still LGTM.

@rainemak rainemak merged commit 92c5850 into sailfishos:master Jul 7, 2022
@Olf0
Copy link
Contributor Author

Olf0 commented Jul 8, 2022

I have been away on a holiday. I will try to work through the responses for other PRs the next couple of days.

@Olf0 Olf0 deleted the patch-1 branch July 8, 2022 22:28
@Olf0
Copy link
Contributor Author

Olf0 commented Jul 9, 2022

@rainemak, thank you very much for merging this PR, despite the fact that it consisted of two commits after addressing the additional changes you requested outside of my original changeset in a second commit.

Note that I never have managed to properly rebase by using GitHub's web-frontend (as you requested), even though the function exists there and I experimented with it few times, despite knowing how rebasing works in theory and practice when using the git command line tool on a locally cloned repository. But for small changesets I always do prefer to use GitHub's web-frontend to clone ("fork") a git-repository, employ changes and submit a PR, because it is much easier, quicker and provides some additional benefits (i.e. here, displaying the zero width spaces). Consequently I do not have a locally cloned git-repository for any of my contributions to SailfishOS, because the all were tiny.

Hence I suggest to loosen Jolla's contributor rule that a PR shall comprise a single commit to "an externally contributed PR initially must comprise a single commit, but each round of changes requested by sailors may be addressed by an additional commit". This would enable contributors to perform all the work at GitHub's web-frontend (i.e., cease to enforce a specific workflow using a locally cloned git-repository). Alternatively a pointer to some guide how to properly use the rebase function of GitHub's web-frontend would be much appreciated (e.g., in Jolla's contributor guidelines), as I failed to find one despite searching for it.

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

4 participants