Skip to content

Commit 30ca916

Browse files
authored
Set SemverCompatible to false for Conan packages (#21275)
Fixes #21250 Related #20414 Conan packages don't have to follow SemVer. The migration fixes the setting for all existing Conan and Generic (#20414) packages.
1 parent 34f509e commit 30ca916

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

models/migrations/migrations.go

+2
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,8 @@ var migrations = []Migration{
413413
NewMigration("Add badges to users", createUserBadgesTable),
414414
// v225 -> v226
415415
NewMigration("Alter gpg_key/public_key content TEXT fields to MEDIUMTEXT", alterPublicGPGKeyContentFieldsToMediumText),
416+
// v226 -> v227
417+
NewMigration("Conan and generic packages do not need to be semantically versioned", fixPackageSemverField),
416418
}
417419

418420
// GetCurrentDBVersion returns the current db version

models/migrations/v226.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2022 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package migrations
6+
7+
import (
8+
"xorm.io/builder"
9+
"xorm.io/xorm"
10+
)
11+
12+
func fixPackageSemverField(x *xorm.Engine) error {
13+
_, err := x.Exec(builder.Update(builder.Eq{"semver_compatible": false}).From("`package`").Where(builder.In("`type`", "conan", "generic")))
14+
return err
15+
}

routers/api/packages/conan/conan.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,7 @@ func uploadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {
342342
Name: rref.Name,
343343
Version: rref.Version,
344344
},
345-
SemverCompatible: true,
346-
Creator: ctx.Doer,
345+
Creator: ctx.Doer,
347346
}
348347
pfci := &packages_service.PackageFileCreationInfo{
349348
PackageFileInfo: packages_service.PackageFileInfo{

tests/integration/api_packages_conan_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ func TestPackageConan(t *testing.T) {
267267

268268
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
269269
assert.NoError(t, err)
270-
assert.NotNil(t, pd.SemVer)
270+
assert.Nil(t, pd.SemVer)
271271
assert.Equal(t, name, pd.Package.Name)
272272
assert.Equal(t, version1, pd.Version.Version)
273273
assert.IsType(t, &conan_module.Metadata{}, pd.Metadata)

0 commit comments

Comments
 (0)