Skip to content

Commit 907f462

Browse files
techknowlogicktechknowlogick
authored
Merge branch 'main' into bitnamilegacy
2 parents 794ec62 + e96ef97 commit 907f462

File tree

440 files changed

+5457
-4208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

440 files changed

+5457
-4208
lines changed

‎.github/workflows/release-nightly.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ jobs:
7575
- name: Get cleaned branch name
7676
id: clean_name
7777
run: |
78-
# if main then say nightly otherwise cleanup name
79-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
80-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
81-
exit 0
82-
fi
8378
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
8479
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
8580
- name: Login to Docker Hub
@@ -122,11 +117,6 @@ jobs:
122117
- name: Get cleaned branch name
123118
id: clean_name
124119
run: |
125-
# if main then say nightly otherwise cleanup name
126-
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
127-
echo "branch=nightly" >> "$GITHUB_OUTPUT"
128-
exit 0
129-
fi
130120
REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
131121
echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
132122
- name: Login to Docker Hub

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ AIR_PACKAGE ?= github.com/air-verse/air@v1
2929
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3
3030
GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
3131
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/[email protected]
32-
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected].12
32+
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/[email protected].15
3333
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/[email protected]
3434
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected]
3535
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest

‎assets/go-licenses.json‎

Lines changed: 71 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/admin.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ func runRepoSyncReleases(ctx context.Context, _ *cli.Command) error {
100100
return err
101101
}
102102

103-
if err := git.InitSimple(ctx); err != nil {
103+
if err := git.InitSimple(); err != nil {
104104
return err
105105
}
106106

‎cmd/admin_user_change_password_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ func TestChangePasswordCommand(t *testing.T) {
1818
ctx := t.Context()
1919

2020
defer func() {
21-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
21+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2222
}()
2323

2424
t.Run("change password successfully", func(t *testing.T) {
2525
// defer func() {
26-
// require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
26+
// require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2727
// }()
2828
// Prepare test user
2929
unittest.AssertNotExistsBean(t, &user_model.User{LowerName: "testuser"})

‎cmd/admin_user_create_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919

2020
func TestAdminUserCreate(t *testing.T) {
2121
reset := func() {
22-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
23-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
24-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
22+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
23+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
24+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
2525
}
2626

2727
t.Run("MustChangePassword", func(t *testing.T) {

‎cmd/admin_user_delete_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
func TestAdminUserDelete(t *testing.T) {
2020
ctx := t.Context()
2121
defer func() {
22-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
23-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
24-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
22+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
23+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
24+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
2525
}()
2626

2727
setupTestUser := func(t *testing.T) {
@@ -104,8 +104,8 @@ func TestAdminUserDeleteFailure(t *testing.T) {
104104
require.Contains(t, err.Error(), tc.expectedErr)
105105
})
106106

107-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
108-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.EmailAddress{}))
109-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &auth_model.AccessToken{}))
107+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
108+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.EmailAddress{}))
109+
require.NoError(t, db.TruncateBeans(t.Context(), &auth_model.AccessToken{}))
110110
}
111111
}

‎cmd/admin_user_must_change_password_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
func TestMustChangePassword(t *testing.T) {
1818
defer func() {
19-
require.NoError(t, db.TruncateBeans(db.DefaultContext, &user_model.User{}))
19+
require.NoError(t, db.TruncateBeans(t.Context(), &user_model.User{}))
2020
}()
2121
err := microcmdUserCreate().Run(t.Context(), []string{"create", "--username", "testuser", "--email", "[email protected]", "--random-password"})
2222
require.NoError(t, err)

‎cmd/doctor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func runRecreateTable(ctx context.Context, cmd *cli.Command) error {
128128
}
129129
recreateTables := migrate_base.RecreateTables(beans...)
130130

131-
return db.InitEngineWithMigration(ctx, func(ctx context.Context, x *xorm.Engine) error {
131+
return db.InitEngineWithMigration(context.Background(), func(ctx context.Context, x *xorm.Engine) error {
132132
if err := migrations.EnsureUpToDate(ctx, x); err != nil {
133133
return err
134134
}

‎cmd/dump.go‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"code.gitea.io/gitea/modules/util"
2121

2222
"gitea.com/go-chi/session"
23-
"github.com/mholt/archiver/v3"
2423
"github.com/urfave/cli/v3"
2524
)
2625

@@ -146,22 +145,18 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
146145
return err
147146
}
148147

149-
archiverGeneric, err := archiver.ByExtension("." + outType)
148+
dumper, err := dump.NewDumper(ctx, outType, outFile)
150149
if err != nil {
151-
fatal("Unable to get archiver for extension: %v", err)
152-
}
153-
154-
archiverWriter := archiverGeneric.(archiver.Writer)
155-
if err := archiverWriter.Create(outFile); err != nil {
156-
fatal("Creating archiver.Writer failed: %v", err)
157-
}
158-
defer archiverWriter.Close()
159-
160-
dumper := &dump.Dumper{
161-
Writer: archiverWriter,
162-
Verbose: verbose,
150+
fatal("Failed to create archive %q: %v", outFile, err)
151+
return err
163152
}
153+
dumper.Verbose = verbose
164154
dumper.GlobalExcludeAbsPath(outFileName)
155+
defer func() {
156+
if err := dumper.Close(); err != nil {
157+
fatal("Failed to save archive %q: %v", outFileName, err)
158+
}
159+
}()
165160

166161
if cmd.IsSet("skip-repository") && cmd.Bool("skip-repository") {
167162
log.Info("Skip dumping local repositories")
@@ -180,7 +175,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
180175
if err != nil {
181176
return err
182177
}
183-
return dumper.AddReader(object, info, path.Join("data", "lfs", objPath))
178+
return dumper.AddFileByReader(object, info, path.Join("data", "lfs", objPath))
184179
}); err != nil {
185180
fatal("Failed to dump LFS objects: %v", err)
186181
}
@@ -218,13 +213,13 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
218213
fatal("Failed to dump database: %v", err)
219214
}
220215

221-
if err = dumper.AddFile("gitea-db.sql", dbDump.Name()); err != nil {
216+
if err = dumper.AddFileByPath("gitea-db.sql", dbDump.Name()); err != nil {
222217
fatal("Failed to include gitea-db.sql: %v", err)
223218
}
224219
}
225220

226221
log.Info("Adding custom configuration file from %s", setting.CustomConf)
227-
if err = dumper.AddFile("app.ini", setting.CustomConf); err != nil {
222+
if err = dumper.AddFileByPath("app.ini", setting.CustomConf); err != nil {
228223
fatal("Failed to include specified app.ini: %v", err)
229224
}
230225

@@ -283,7 +278,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
283278
if err != nil {
284279
return err
285280
}
286-
return dumper.AddReader(object, info, path.Join("data", "attachments", objPath))
281+
return dumper.AddFileByReader(object, info, path.Join("data", "attachments", objPath))
287282
}); err != nil {
288283
fatal("Failed to dump attachments: %v", err)
289284
}
@@ -297,7 +292,7 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
297292
if err != nil {
298293
return err
299294
}
300-
return dumper.AddReader(object, info, path.Join("data", "packages", objPath))
295+
return dumper.AddFileByReader(object, info, path.Join("data", "packages", objPath))
301296
}); err != nil {
302297
fatal("Failed to dump packages: %v", err)
303298
}
@@ -322,10 +317,6 @@ func runDump(ctx context.Context, cmd *cli.Command) error {
322317
if outFileName == "-" {
323318
log.Info("Finish dumping to stdout")
324319
} else {
325-
if err = archiverWriter.Close(); err != nil {
326-
_ = os.Remove(outFileName)
327-
fatal("Failed to save %q: %v", outFileName, err)
328-
}
329320
if err = os.Chmod(outFileName, 0o600); err != nil {
330321
log.Info("Can't change file access permissions mask to 0600: %v", err)
331322
}

0 commit comments

Comments
 (0)