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

move some scripts from 'build' to 'tools' directory, misc refactors #29844

Merged
merged 11 commits into from
Mar 17, 2024
Merged

move some scripts from 'build' to 'tools' directory, misc refactors #29844

merged 11 commits into from
Mar 17, 2024

Conversation

silverwind
Copy link
Member

@silverwind silverwind commented Mar 16, 2024 •
edited
Loading

  • Move some scripts from build to new tools dir. Eventually i would like to move all but let's do it step-by-step.
  • Add dir to eslint and move the files into vars.
  • Update docs accordingly.
  • While updating docs I noticed we were incorrectly having public/img path still in a few places. Replace those with the current public/assets/img.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 16, 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 16, 2024
silverwind
silverwind commented Mar 16, 2024
View reviewed changes
.dockerignore Outdated Show resolved Hide resolved
@denyskon
Copy link
Member

Wait, why do we still have Chinese docs? Didn't we decide to only have English, or am I hallucinating?

@silverwind
Copy link
Member Author

silverwind commented Mar 16, 2024 •
edited
Loading

Not sure about such a decision, but I would be all for removing all non-english docs 👍

As this PR proves again, they are just becoming a outdated mess over time and hold up review process because there is really only one active chinese speaker in the reviewers.

@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 16, 2024
@lng2020 lng2020 self-requested a review March 16, 2024 13:23
@GiteaBot GiteaBot added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 16, 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 16, 2024
silverwind and others added 2 commits March 16, 2024 14:50
@silverwind @lng2020
Update docs/content/development/hacking-on-gitea.zh-cn.md
00d7860 
Co-authored-by: Nanguan Lin <nanguanlin6@gmail.com>
@silverwind @lng2020
Update docs/content/administration/cmd-embedded.zh-cn.md
242e905 
Co-authored-by: Nanguan Lin <nanguanlin6@gmail.com>
@silverwind silverwind changed the title move some scripts from 'build' to 'tools' directory move some scripts from 'build' to 'tools' directory, misc refactors Mar 16, 2024
@wxiaoguang
Copy link
Contributor

Move some scripts from build to new tools dir. Eventually i would like to move all but let's do it step-by-step.

Do you mean to rename "build" to "tools" eventually? TBH I don't see real benefit or difference.

@techknowlogick
Copy link
Member

Do you mean to rename "build" to "tools" eventually? TBH I don't see real benefit or difference.

I see it as tools is less specific to building gitea itself, as with generating the logo can be done with Gitea already being built.

@wxiaoguang
Copy link
Contributor

wxiaoguang commented Mar 17, 2024 •
edited
Loading

as with generating the logo can be done with Gitea already being built.

Yup, while I think "build/generate-svg.js" could also be interpreted as "building Gitea related assets" (that's what I meant "don't see real benefit or difference").

Actually I am neutral for this renaming. My major question is Do you mean to rename "build" to "tools" eventually?

  • If yes: some files like "test-env-check.sh" doesn't seems to be a "tool" (maybe they need a new directory?)
  • If no: what kind of files should be left in "build" while what kind of files should be moved to "tools"? A plan would be very helpful.

@silverwind
Copy link
Member Author

silverwind commented Mar 17, 2024 •
edited
Loading

Do you mean to rename "build" to "tools" eventually?

Yes. I find the "build" name unsuitable for general scripts. For all I know "build" could also contain built files, which it doesn't.

If yes: some files like "test-env-check.sh" doesn't seems to be a "tool" (maybe they need a new directory?)

As I see it, every script is a tool.

Primary reason for the change is #29825, which just doesn't fit into the "build" directory at all.

wxiaoguang
wxiaoguang approved these changes Mar 17, 2024
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

Hopefully "build" and "tools" directories won't co-exist for long time, otherwise people might hesitate about which one to use 😄

@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 17, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 17, 2024
@silverwind silverwind merged commit 095fdd6 into go-gitea:main Mar 17, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Mar 17, 2024
@silverwind silverwind deleted the toolsdir branch March 17, 2024 22:12
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 17, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 19, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
ea2609e 
* giteaofficial/main:
  Fix missing error check of bufio.Scanner (go-gitea#29882)
  Remove unused error in graceful manager (go-gitea#29871)
  Migrate border and margin classes to Tailwind (go-gitea#29828)
  Only do counting when count_only=true for repo dashboard (go-gitea#29884)
  Editor error message misleading due to re-used key. (go-gitea#29859)
  [skip ci] Updated licenses and gitignores
  move some scripts from 'build' to 'tools' directory, misc refactors (go-gitea#29844)
  Fix missing code in the user profile (go-gitea#29865)
  Upgrade Go 1.22 and upgrade dependency (go-gitea#29869)
  Fix the wrong locale key of searching users (go-gitea#29868)
  fix telegram webhook (go-gitea#29864)
  Fix user id column case (go-gitea#29863)
  Avoid JS error on issue/pr list when logged out (go-gitea#29854)
  Refactor clone-panel styles (go-gitea#29861)
  Simplify README (go-gitea#29827)
  Load citation JS only when needed (go-gitea#29855)
  Fix semantic.json (go-gitea#29860)

# Conflicts:
#	templates/repo/wiki/revision.tmpl
#	templates/repo/wiki/view.tmpl
@lunny lunny modified the milestones: 1.23.0, 1.22.0 Mar 22, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lng2020 lng2020 lng2020 approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/docs modifies/internal modifies/js 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.

None yet
7 participants
@silverwind @denyskon @wxiaoguang @techknowlogick @lng2020 @lunny @GiteaBot