magic_rb/forgejo
Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-24 02:36:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set SemverCompatible to false for Conan packages (#21275) (#21366)

Browse source 
Backport of #21275
This commit is contained in:
KN4CK3R 2022-10-10 14:46:09 +02:00 committed by GitHub
parent a3c75ac438
commit c83a05f114
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integrations/api_packages_conan_test.go
View file

@ -266,7 +266,7 @@ func TestPackageConan(t *testing.T) {
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0]) pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, pd.SemVer) assert.Nil(t, pd.SemVer)
assert.Equal(t, name, pd.Package.Name) assert.Equal(t, name, pd.Package.Name)
assert.Equal(t, version1, pd.Version.Version) assert.Equal(t, version1, pd.Version.Version)
assert.IsType(t, &conan_module.Metadata{}, pd.Metadata) assert.IsType(t, &conan_module.Metadata{}, pd.Metadata)

3
routers/api/packages/conan/conan.go
View file

@ -342,8 +342,7 @@ func uploadFile(ctx *context.Context, fileFilter stringSet, fileKey string) {
Name: rref.Name, Name: rref.Name,
Version: rref.Version, Version: rref.Version,
}, },
SemverCompatible: true, Creator: ctx.Doer,
Creator: ctx.Doer,
} }
pfci := &packages_service.PackageFileCreationInfo{ pfci := &packages_service.PackageFileCreationInfo{
PackageFileInfo: packages_service.PackageFileInfo{ PackageFileInfo: packages_service.PackageFileInfo{