Commit 36d2dc67 authored by Steve Abrams's avatar Steve Abrams Committed by Sean McGivern

Revert addition of conan_sources and conan_export

The addition of conan_sources and conan_export
allows users to upload Conan packages with those
files but cause errors on package uploads that
do not include those files.

The change is reverted until the bug can be fixed.
parent f6d1e7d2
...@@ -18,7 +18,7 @@ class Packages::Conan::FileMetadatum < ApplicationRecord ...@@ -18,7 +18,7 @@ class Packages::Conan::FileMetadatum < ApplicationRecord
enum conan_file_type: { recipe_file: 1, package_file: 2 } enum conan_file_type: { recipe_file: 1, package_file: 2 }
RECIPE_FILES = %w[conanfile.py conanmanifest.txt conan_sources.tgz conan_export.tgz].freeze RECIPE_FILES = %w[conanfile.py conanmanifest.txt].freeze
PACKAGE_FILES = %w[conaninfo.txt conanmanifest.txt conan_package.tgz].freeze PACKAGE_FILES = %w[conaninfo.txt conanmanifest.txt conan_package.tgz].freeze
PACKAGE_BINARY = 'conan_package.tgz' PACKAGE_BINARY = 'conan_package.tgz'
......
---
title: Revert breaking changes to allow conan_sources.tgz and conan_export.tgz files
in the Conan repository
merge_request: 33435
author:
type: fixed
...@@ -419,9 +419,7 @@ describe API::ConanPackages do ...@@ -419,9 +419,7 @@ describe API::ConanPackages do
let(:params) do let(:params) do
{ "conanfile.py": 24, { "conanfile.py": 24,
"conanmanifext.txt": 123, "conanmanifext.txt": 123 }
"conan_sources.tgz": 523,
"conan_export.tgz": 432 }
end end
subject { post api("/packages/conan/v1/conans/#{recipe_path}/upload_urls"), params: params, headers: headers } subject { post api("/packages/conan/v1/conans/#{recipe_path}/upload_urls"), params: params, headers: headers }
...@@ -433,9 +431,7 @@ describe API::ConanPackages do ...@@ -433,9 +431,7 @@ describe API::ConanPackages do
expected_response = { expected_response = {
'conanfile.py': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py", 'conanfile.py': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanfile.py",
'conanmanifest.txt': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt", 'conanmanifest.txt': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conanmanifest.txt"
'conan_sources.tgz': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_sources.tgz",
'conan_export.tgz': "#{Settings.gitlab.base_url}/api/v4/packages/conan/v1/files/#{package.conan_recipe_path}/0/export/conan_export.tgz"
} }
expect(response.body).to eq(expected_response.to_json) expect(response.body).to eq(expected_response.to_json)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment