From 332c4f7e72e249e42dd9c6245520af4d55aff01d Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 14 Jun 2023 09:50:03 +0800 Subject: [PATCH 1/2] Fix description of drop custom_labels migration --- models/migrations/migrations.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 2aaed997ad84f..2ba153bd39fb4 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -499,10 +499,10 @@ var migrations = []Migration{ // v259 -> 260 NewMigration("Convert scoped access tokens", v1_20.ConvertScopedAccessTokens), - // Gitea 1.21.0 ends at 260 + // Gitea 1.20.0 ends at 260 // v260 -> v261 - NewMigration("Add label column to action_run table, and combine labels", v1_21.DropCustomLabelsColumnToActRunner), + NewMigration("Drop custom_labels column of action_runner table", v1_21.DropCustomLabelsColumnToActRunner), } // GetCurrentDBVersion returns the current db version From a021c5c8ddbb2e6c70e5eee38792549f99edbee8 Mon Sep 17 00:00:00 2001 From: sillyguodong Date: Wed, 14 Jun 2023 10:01:22 +0800 Subject: [PATCH 2/2] fix the name of function --- models/migrations/migrations.go | 2 +- models/migrations/v1_21/v260.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 2ba153bd39fb4..26fe1dea129c3 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -502,7 +502,7 @@ var migrations = []Migration{ // Gitea 1.20.0 ends at 260 // v260 -> v261 - NewMigration("Drop custom_labels column of action_runner table", v1_21.DropCustomLabelsColumnToActRunner), + NewMigration("Drop custom_labels column of action_runner table", v1_21.DropCustomLabelsColumnOfActionRunner), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v1_21/v260.go b/models/migrations/v1_21/v260.go index d66f5b01379c5..6ca52c5998df7 100644 --- a/models/migrations/v1_21/v260.go +++ b/models/migrations/v1_21/v260.go @@ -9,7 +9,7 @@ import ( "xorm.io/xorm" ) -func DropCustomLabelsColumnToActRunner(x *xorm.Engine) error { +func DropCustomLabelsColumnOfActionRunner(x *xorm.Engine) error { sess := x.NewSession() defer sess.Close()