hinterland/hearth
2
2
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: update gitea vendor
runner nix smoke / nix label and flake smoke (push) Failing after 1m28s
Details

Browse Source
This commit is contained in:
yukkop
2026-09-26 21:18:24 +00:00
parent c439c1b948
commit d9b2a4e787
3538 changed files with 116131 additions and 44340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/gitea/source/models/migrations/v1_19/main_test.go
+2 -2
View File
@@ -6,9 +6,9 @@ package v1_19
import (
"testing"
"code.gitea.io/gitea/models/migrations/base"
"gitea.dev/models/migrations/migrationtest"
)
func TestMain(m *testing.M) {
base.MainTest(m)
migrationtest.MainTest(m)
}
package/gitea/source/models/migrations/v1_19/v231.go
+2 -4
View File
@@ -3,11 +3,9 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
func AddIndexForHookTask(x *xorm.Engine) error {
func AddIndexForHookTask(x db.EngineMigration) error {
type HookTask struct {
ID int64 `xorm:"pk autoincr"`
HookID int64 `xorm:"index"`
package/gitea/source/models/migrations/v1_19/v232.go
+3 -4
View File
@@ -4,12 +4,11 @@
package v1_19
import (
"code.gitea.io/gitea/modules/setting"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/setting"
)
func AlterPackageVersionMetadataToLongText(x *xorm.Engine) error {
func AlterPackageVersionMetadataToLongText(x db.EngineMigration) error {
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
package/gitea/source/models/migrations/v1_19/v233.go
+15 -16
View File
@@ -6,16 +6,15 @@ package v1_19
import (
"fmt"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/secret"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"gitea.dev/models/db"
"gitea.dev/modules/json"
"gitea.dev/modules/secret"
"gitea.dev/modules/setting"
"xorm.io/builder"
"xorm.io/xorm"
)
func batchProcess[T any](x *xorm.Engine, buf []T, query func(limit, start int) *xorm.Session, process func(*xorm.Session, T) error) error {
func batchProcess[T any](x db.EngineMigration, buf []T, query func(limit, start int) db.Session, process func(db.Session, T) error) error {
size := cap(buf)
start := 0
for {
@@ -52,7 +51,7 @@ func batchProcess[T any](x *xorm.Engine, buf []T, query func(limit, start int) *
}
}
func AddHeaderAuthorizationEncryptedColWebhook(x *xorm.Engine) error {
func AddHeaderAuthorizationEncryptedColWebhook(x db.EngineMigration) error {
// Add the column to the table
type Webhook struct {
ID int64 `xorm:"pk autoincr"`
@@ -81,10 +80,10 @@ func AddHeaderAuthorizationEncryptedColWebhook(x *xorm.Engine) error {
err = batchProcess(x,
make([]*Webhook, 0, 50),
func(limit, start int) *xorm.Session {
func(limit, start int) db.Session {
return x.Where("type=?", "matrix").OrderBy("id").Limit(limit, start)
},
func(sess *xorm.Session, hook *Webhook) error {
func(sess db.Session, hook *Webhook) error {
// retrieve token from meta
var withToken MatrixMetaWithAccessToken
err := json.Unmarshal([]byte(hook.Meta), &withToken)
@@ -129,11 +128,11 @@ func AddHeaderAuthorizationEncryptedColWebhook(x *xorm.Engine) error {
}
type MatrixPayloadSafe struct {
Body string `json:"body"`
MsgType string `json:"msgtype"`
Format string `json:"format"`
FormattedBody string `json:"formatted_body"`
Commits []*api.PayloadCommit `json:"io.gitea.commits,omitempty"`
Body string `json:"body"`
MsgType string `json:"msgtype"`
Format string `json:"format"`
FormattedBody string `json:"formatted_body"`
Commits json.Value `json:"io.gitea.commits,omitempty"`
}
type MatrixPayloadUnsafe struct {
MatrixPayloadSafe
@@ -142,13 +141,13 @@ func AddHeaderAuthorizationEncryptedColWebhook(x *xorm.Engine) error {
err = batchProcess(x,
make([]*HookTask, 0, 50),
func(limit, start int) *xorm.Session {
func(limit, start int) db.Session {
return x.Where(builder.And(
builder.In("hook_id", builder.Select("id").From("webhook").Where(builder.Eq{"type": "matrix"})),
builder.Like{"payload_content", "access_token"},
)).OrderBy("id").Limit(limit, 0) // ignore the provided "start", since other payload were already converted and don't contain 'payload_content' anymore
},
func(sess *xorm.Session, hookTask *HookTask) error {
func(sess db.Session, hookTask *HookTask) error {
// retrieve token from payload_content
var withToken MatrixPayloadUnsafe
err := json.Unmarshal([]byte(hookTask.PayloadContent), &withToken)
package/gitea/source/models/migrations/v1_19/v233_test.go
+6 -6
View File
@@ -6,11 +6,11 @@ package v1_19
import (
"testing"
"code.gitea.io/gitea/models/migrations/base"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/secret"
"code.gitea.io/gitea/modules/setting"
webhook_module "code.gitea.io/gitea/modules/webhook"
"gitea.dev/models/migrations/migrationtest"
"gitea.dev/modules/json"
"gitea.dev/modules/secret"
"gitea.dev/modules/setting"
webhook_module "gitea.dev/modules/webhook"
"github.com/stretchr/testify/assert"
)
@@ -39,7 +39,7 @@ func Test_AddHeaderAuthorizationEncryptedColWebhook(t *testing.T) {
}
// Prepare and load the testing database
x, deferable := base.PrepareTestEnv(t, 0, new(Webhook), new(ExpectedWebhook), new(HookTask))
x, deferable := migrationtest.PrepareTestEnv(t, 0, new(Webhook), new(ExpectedWebhook), new(HookTask))
defer deferable()
if x == nil || t.Failed() {
return
package/gitea/source/models/migrations/v1_19/v234.go
+3 -4
View File
@@ -4,12 +4,11 @@
package v1_19
import (
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/timeutil"
)
func CreatePackageCleanupRuleTable(x *xorm.Engine) error {
func CreatePackageCleanupRuleTable(x db.EngineMigration) error {
type PackageCleanupRule struct {
ID int64 `xorm:"pk autoincr"`
Enabled bool `xorm:"INDEX NOT NULL DEFAULT false"`
package/gitea/source/models/migrations/v1_19/v235.go
+2 -4
View File
@@ -3,11 +3,9 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
func AddIndexForAccessToken(x *xorm.Engine) error {
func AddIndexForAccessToken(x db.EngineMigration) error {
type AccessToken struct {
TokenLastEight string `xorm:"INDEX token_last_eight"`
}
package/gitea/source/models/migrations/v1_19/v236.go
+3 -4
View File
@@ -4,12 +4,11 @@
package v1_19
import (
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/timeutil"
)
func CreateSecretsTable(x *xorm.Engine) error {
func CreateSecretsTable(x db.EngineMigration) error {
type Secret struct {
ID int64
OwnerID int64 `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL"`
package/gitea/source/models/migrations/v1_19/v237.go
+2 -4
View File
@@ -3,11 +3,9 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
func DropForeignReferenceTable(x *xorm.Engine) error {
func DropForeignReferenceTable(x db.EngineMigration) error {
// Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used.
// See: https://github.com/go-gitea/gitea/issues/21086#issuecomment-1318217453
type ForeignReference struct{}
package/gitea/source/models/migrations/v1_19/v238.go
+3 -4
View File
@@ -4,13 +4,12 @@
package v1_19
import (
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/timeutil"
)
// AddUpdatedUnixToLFSMetaObject adds an updated column to the LFSMetaObject to allow for garbage collection
func AddUpdatedUnixToLFSMetaObject(x *xorm.Engine) error {
func AddUpdatedUnixToLFSMetaObject(x db.EngineMigration) error {
// Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used.
// See: https://github.com/go-gitea/gitea/issues/21086#issuecomment-1318217453
// LFSMetaObject stores metadata for LFS tracked files.
package/gitea/source/models/migrations/v1_19/v239.go
+2 -4
View File
@@ -3,11 +3,9 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
func AddScopeForAccessTokens(x *xorm.Engine) error {
func AddScopeForAccessTokens(x db.EngineMigration) error {
type AccessToken struct {
Scope string
}
package/gitea/source/models/migrations/v1_19/v240.go
+3 -5
View File
@@ -4,13 +4,11 @@
package v1_19
import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/timeutil"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/timeutil"
)
func AddActionsTables(x *xorm.Engine) error {
func AddActionsTables(x db.EngineMigration) error {
type ActionRunner struct {
ID int64
UUID string `xorm:"CHAR(36) UNIQUE"`
package/gitea/source/models/migrations/v1_19/v241.go
+2 -4
View File
@@ -3,12 +3,10 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
// AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly
func AddCardTypeToProjectTable(x *xorm.Engine) error {
func AddCardTypeToProjectTable(x db.EngineMigration) error {
type Project struct {
CardType int `xorm:"NOT NULL DEFAULT 0"`
}
package/gitea/source/models/migrations/v1_19/v242.go
+3 -4
View File
@@ -4,13 +4,12 @@
package v1_19
import (
"code.gitea.io/gitea/modules/setting"
"xorm.io/xorm"
"gitea.dev/models/db"
"gitea.dev/modules/setting"
)
// AlterPublicGPGKeyImportContentFieldToMediumText: set GPGKeyImport Content field to MEDIUMTEXT
func AlterPublicGPGKeyImportContentFieldToMediumText(x *xorm.Engine) error {
func AlterPublicGPGKeyImportContentFieldToMediumText(x db.EngineMigration) error {
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
package/gitea/source/models/migrations/v1_19/v243.go
+2 -4
View File
@@ -3,11 +3,9 @@
package v1_19
import (
"xorm.io/xorm"
)
import "gitea.dev/models/db"
func AddExclusiveLabel(x *xorm.Engine) error {
func AddExclusiveLabel(x db.EngineMigration) error {
type Label struct {
Exclusive bool
}