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.

Sign up for GitHub

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

Jump to bottom

Update to labeler v5 #29721

Merged
merged 10 commits into from
Mar 12, 2024
Merged

Update to labeler v5 #29721

merged 10 commits into from
Mar 12, 2024

Conversation

denyskon
Copy link
Member

Updated to actions/labeler@v5

Updated labeler config accordingly, also improved the config and added more labels.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 11, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 11, 2024
@denyskon denyskon added this to the 1.22.0 milestone Mar 11, 2024
@denyskon denyskon added the backport/v1.21 This PR should be backported to Gitea 1.21 label Mar 11, 2024
@silverwind
Copy link
Member

Re-indent to 2-space please?

@denyskon
Copy link
Member Author

@silverwind
grafik

yamllint doesn't seem to like 2-space

@silverwind
Copy link
Member

yamllint doesn't seem to like 2-space

Odd, we specifically have set it to 2-space:

gitea/.yamllint.yaml

Lines 34 to 35 in e5e2b2f

indentation:
spaces: 2

@denyskon
Copy link
Member Author

Could be related to this weird list layout instead of traditional object-like. Nevertheless, that seems to be the correct one even though it looks weird. It actually is two-space indentation for object keys, but somehow 4-space for list items.

Is it a blocker for you?

@silverwind
Copy link
Member

I'll investigate. Smells like a yamllint bug.

@silverwind
Copy link
Member

silverwind commented Mar 12, 2024 •
edited
Loading

Not a bug, but just a odd outcome because indent-sequences: true requires sequences (-) to indent which looks odd in these cases because of the nesting. I think we may want to change this config to consistent later.

silverwind
silverwind reviewed Mar 12, 2024
View reviewed changes
.github/labeler.yml Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 12, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Mar 12, 2024
silverwind
silverwind reviewed Mar 12, 2024
View reviewed changes
.github/labeler.yml Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 12, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 12, 2024
@silverwind
Copy link
Member

silverwind commented Mar 12, 2024 •
edited
Loading

Ok, I will rename labels when merging this:

  • go -> modifies/go
  • javascript -> modifies/js

delvh
delvh approved these changes Mar 12, 2024
View reviewed changes
Copy link
Member

@delvh delvh left a comment •
edited
Loading

Choose a reason for hiding this comment

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

for the record, we had a changelog label but no longer have it.
I think it was replaced with type/changelog, and I don't think it was ever set automatically.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 12, 2024
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 12, 2024
@silverwind silverwind enabled auto-merge (squash) March 12, 2024 21:42
@silverwind
Copy link
Member

Labels are renamed.

@silverwind silverwind merged commit 225fc40 into go-gitea:main Mar 12, 2024
26 checks passed
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @denyskon, please send one manually. 🍵

go run ./contrib/backport 29721
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Mar 12, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 13, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
4fec29d 
* giteaofficial/main:
  Fix date rendering by adding `<gitea-absolute-date>` (go-gitea#29725)
  Update to labeler v5 (go-gitea#29721)
  Update Chroma to v2.13.0 (go-gitea#29732)
  Highlight archived labels (go-gitea#29680)
denyskon added a commit to denyskon/gitea that referenced this pull request Mar 13, 2024
@denyskon @GiteaBot
Update to labeler v5 (go-gitea#29721)
6aec432 
Updated to actions/labeler@v5

Updated labeler config accordingly, also improved the config and added
more labels.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
@denyskon denyskon mentioned this pull request Mar 13, 2024
Merged
@denyskon denyskon deleted the labeler-v5 branch March 13, 2024 11:17
@denyskon denyskon added the backport/done All backports for this PR have been created label Mar 13, 2024
silverwind pushed a commit that referenced this pull request Mar 13, 2024
@denyskon @GiteaBot
Update to labeler v5 (#29721) (#29765)
bb98603 
Backport #29721

Updated to actions/labeler@v5

Updated labeler config accordingly, also improved the config and added
more labels.

Co-authored-by: Giteabot <teabot@gitea.io>
silverwind added a commit to silverwind/gitea that referenced this pull request Mar 13, 2024
@silverwind
Merge branch 'main' into overflow-menu
b1e4857 
* main:
  fix missed RenderLabel change in card template (go-gitea#29772)
  Fix incorrect locale Tr for gpg command (go-gitea#29754)
  Improve a11y document and dropdown item (go-gitea#29753)
  Improve QueryEscape helper function (go-gitea#29768)
  Use relative links for commits, mentions, and issues in markdown (go-gitea#29427)
  Move fork router functions to a standalone file (go-gitea#29756)
  Configure pinned JS dependencies via updates.config.js (go-gitea#29696)
  Refactor to use optional.Option for issue index search option (go-gitea#29739)
  Fix user router possbile panic (go-gitea#29751)
  Refactor label.IsArchived() (go-gitea#29750)
  Fix date rendering by adding `<gitea-absolute-date>` (go-gitea#29725)
  Update to labeler v5 (go-gitea#29721)
  Update Chroma to v2.13.0 (go-gitea#29732)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/internal size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
4 participants
@denyskon @silverwind @GiteaBot @delvh