From 045603d65ec959aa6b470ad05c1d7f5a4ed90b27 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Jan 2023 20:10:08 +0700 Subject: [PATCH] Gitea-ui-customized : update to be compatible with Gitea 1.18 build_gitea : Support git tag and build a completely usable binary --- .../templates/base/head_navbar.tmpl | 83 ++++++++++--------- build_gitea/Linux/build.sh | 26 +++++- 2 files changed, 65 insertions(+), 44 deletions(-) diff --git a/Gitea-ui-customized/templates/base/head_navbar.tmpl b/Gitea-ui-customized/templates/base/head_navbar.tmpl index 5e75897..1a8e57e 100644 --- a/Gitea-ui-customized/templates/base/head_navbar.tmpl +++ b/Gitea-ui-customized/templates/base/head_navbar.tmpl @@ -4,11 +4,11 @@ {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} {{end}}
- - + + {{if .IsSigned}} - + {{svg "octicon-bell"}} @@ -26,19 +26,19 @@ {{/* No links */}} {{else if .IsSigned}} {{if not .UnitIssuesGlobalDisabled}} - {{.i18n.Tr "issues"}} + {{.locale.Tr "issues"}} {{end}} {{if not .UnitPullsGlobalDisabled}} - {{.i18n.Tr "pull_requests"}} + {{.locale.Tr "pull_requests"}} {{end}} {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} - {{if .ShowMilestonesDashboardPage}}{{.i18n.Tr "milestones"}}{{end}} + {{if .ShowMilestonesDashboardPage}}{{.locale.Tr "milestones"}}{{end}} {{end}} - {{.i18n.Tr "explore"}} + {{.locale.Tr "explore"}} {{else if .IsLandingPageOrganizations}} - {{.i18n.Tr "explore"}} + {{.locale.Tr "explore"}} {{else}} - {{.i18n.Tr "explore"}} + {{.locale.Tr "explore"}} {{end}} {{template "custom/extra_links" .}} @@ -46,7 +46,7 @@ {{/* TODO
- + {{svg "octicon-search" 16}}
@@ -55,22 +55,22 @@ {{if and .IsSigned .MustChangePassword}}
-
+
{{avatar .SignedUser 24 "tiny"}} - {{.i18n.Tr "user_profile_and_more"}} + {{.locale.Tr "user_profile_and_more"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}}
- {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} + {{.locale.Tr "signed_in_as"}} {{.SignedUser.Name}}
{{svg "octicon-sign-out"}} - {{.i18n.Tr "sign_out"}} + {{.locale.Tr "sign_out"}}
@@ -83,13 +83,13 @@ {{svg "octicon-stopwatch"}} {{svg "octicon-dot-fill"}} - {{.i18n.Tr "active_stopwatch"}} + {{.locale.Tr "active_stopwatch"}} -
+
- {{svg "octicon-issue-opened"}} + {{svg "octicon-issue-opened" 16 "mr-3"}} {{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}} {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}} @@ -98,23 +98,25 @@
{{.CsrfTokenHtml}}
{{.CsrfTokenHtml}}
- + {{svg "octicon-bell"}} @@ -123,73 +125,73 @@ -
+
{{svg "octicon-plus"}} - {{.i18n.Tr "create_new"}} + {{.locale.Tr "create_new"}} {{svg "octicon-triangle-down"}}
- {{svg "octicon-plus"}} {{.i18n.Tr "new_repo"}} + {{svg "octicon-plus"}} {{.locale.Tr "new_repo"}} {{if not .DisableMigrations}} - {{svg "octicon-repo-push"}} {{.i18n.Tr "new_migrate"}} + {{svg "octicon-repo-push"}} {{.locale.Tr "new_migrate"}} {{end}} {{if .SignedUser.CanCreateOrganization}} - {{svg "octicon-organization"}} {{.i18n.Tr "new_org"}} + {{svg "octicon-organization"}} {{.locale.Tr "new_org"}} {{end}}
-
+
{{avatar .SignedUser 24 "tiny"}} - {{.i18n.Tr "user_profile_and_more"}} + {{.locale.Tr "user_profile_and_more"}} {{.SignedUser.Name}} {{svg "octicon-triangle-down"}}
- {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} + {{.locale.Tr "signed_in_as"}} {{.SignedUser.Name}}
{{svg "octicon-person"}} - {{.i18n.Tr "your_profile"}} + {{.locale.Tr "your_profile"}} {{if not .DisableStars}} {{svg "octicon-star"}} - {{.i18n.Tr "your_starred"}} + {{.locale.Tr "your_starred"}} {{end}} + + {{svg "octicon-bell"}} + {{.locale.Tr "notification.subscriptions"}} + {{svg "octicon-tools"}} - {{.i18n.Tr "your_settings"}} - - - {{svg "octicon-question"}} - {{.i18n.Tr "help"}} + {{.locale.Tr "your_settings"}} {{if .IsAdmin}}
{{svg "octicon-server"}} - {{.i18n.Tr "admin_panel"}} + {{.locale.Tr "admin_panel"}} {{end}}
{{svg "octicon-sign-out"}} - {{.i18n.Tr "sign_out"}} + {{.locale.Tr "sign_out"}}
@@ -198,12 +200,13 @@
{{if .ShowRegistrationButton}} - {{svg "octicon-person"}} {{.i18n.Tr "register"}} + {{svg "octicon-person"}} {{.locale.Tr "register"}} {{end}} - + Homepage - + +
{{end}}
\ No newline at end of file diff --git a/build_gitea/Linux/build.sh b/build_gitea/Linux/build.sh index b9d6ddd..a922dfc 100644 --- a/build_gitea/Linux/build.sh +++ b/build_gitea/Linux/build.sh @@ -4,9 +4,11 @@ DESTINATION=~/gitea-binaries/ mkdir -p $DESTINATION cd $MAKE_DIR +GIT_TAG=$1 + # NodeJS -VERSION=v19.2.0 +VERSION=v19.4.0 DISTRO=linux-x64 wget https://nodejs.org/dist/$VERSION/node-$VERSION-$DISTRO.tar.xz @@ -17,7 +19,7 @@ export PATH=/usr/local/lib/nodejs/node-$VERSION-$DISTRO/bin:$PATH # Golang -GO_VERSION=1.19.3 +GO_VERSION=1.19.5 sudo unlink /usr/bin/go wget https://go.dev/dl/go$GO_VERSION.linux-amd64.tar.gz @@ -31,10 +33,26 @@ sudo apt-get update && sudo apt-get install make # Gitea -git clone --depth=1 https://github.com/go-gitea/gitea +# GIT_TAG= +# specify the tag which gitea will build on + +git clone https://github.com/go-gitea/gitea cd gitea -LDFLAGS="-X \"code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/\" -X \"code.gitea.io/gitea/modules/setting.CustomConf=/etc/gitea/app.ini\"" GOOS=linux GOARCH=amd64 make build + +if [[ -n $GIT_TAG ]] +then + if git show-ref $GIT_TAG --quiet; then + git checkout $GIT_TAG + else + echo "Variable GIT_TAG doesn't existed in the repo. fallback to default" + fi +else + echo "GIT_TAG variable doesn't exist skipping" +fi + +LDFLAGS="-X \"code.gitea.io/gitea/modules/setting.AppWorkPath=/var/lib/gitea/\" -X \"code.gitea.io/gitea/modules/setting.CustomConf=/etc/gitea/app.ini\"" TAGS="bindata sqlite sqlite_unlock_notify" GOOS=linux GOARCH=amd64 make build mv gitea $DESTINATION/gitea # Cleanup + rm -rf $MAKE_DIR \ No newline at end of file