#784: remove "build_requires" from BuildList
This commit is contained in:
parent
d3aa32be64
commit
f25a988730
|
@ -318,7 +318,7 @@ class BuildList < ActiveRecord::Base
|
||||||
arch.name,
|
arch.name,
|
||||||
(save_to_platform_id == build_for_platform_id ? '' : build_for_platform.name),
|
(save_to_platform_id == build_for_platform_id ? '' : build_for_platform.name),
|
||||||
update_type,
|
update_type,
|
||||||
build_requires,
|
false,
|
||||||
id,
|
id,
|
||||||
include_repos,
|
include_repos,
|
||||||
priority,
|
priority,
|
||||||
|
@ -446,7 +446,7 @@ class BuildList < ActiveRecord::Base
|
||||||
:git_project_address => project.git_project_address(user),
|
:git_project_address => project.git_project_address(user),
|
||||||
# :commit_hash => 'fbb2549e44d97226fea6748a4f95d1d82ffb8726',
|
# :commit_hash => 'fbb2549e44d97226fea6748a4f95d1d82ffb8726',
|
||||||
:commit_hash => commit_hash,
|
:commit_hash => commit_hash,
|
||||||
:build_requires => build_requires,
|
:build_requires => false,
|
||||||
:include_repos => include_repos_hash,
|
:include_repos => include_repos_hash,
|
||||||
:bplname => build_for_platform.name,
|
:bplname => build_for_platform.name,
|
||||||
:user => {:uname => user.uname, :email => user.email}
|
:user => {:uname => user.uname, :email => user.email}
|
||||||
|
|
|
@ -143,7 +143,6 @@ class Project < ActiveRecord::Base
|
||||||
bl.update_type = 'newpackage'
|
bl.update_type = 'newpackage'
|
||||||
bl.arch = arch
|
bl.arch = arch
|
||||||
bl.project_version = "latest_#{platform.name}"
|
bl.project_version = "latest_#{platform.name}"
|
||||||
bl.build_requires = false # already set as db default
|
|
||||||
bl.user = user
|
bl.user = user
|
||||||
bl.auto_publish = auto_publish
|
bl.auto_publish = auto_publish
|
||||||
bl.include_repos = build_reps_ids
|
bl.include_repos = build_reps_ids
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
json.build_list do |json|
|
json.build_list do |json|
|
||||||
json.(@build_list, :id, :name, :container_path, :status, :duration)
|
json.(@build_list, :id, :name, :container_path, :status, :duration)
|
||||||
json.(@build_list, :is_circle, :update_type, :build_requires, :priority)
|
json.(@build_list, :is_circle, :update_type, :priority)
|
||||||
json.(@build_list, :advisory, :mass_build)
|
json.(@build_list, :advisory, :mass_build)
|
||||||
json.(@build_list, :auto_publish, :package_version, :commit_hash, :last_published_commit_hash)
|
json.(@build_list, :auto_publish, :package_version, :commit_hash, :last_published_commit_hash)
|
||||||
json.build_log_url log_build_list_path(@build_list)
|
json.build_log_url log_build_list_path(@build_list)
|
||||||
|
|
|
@ -26,9 +26,6 @@
|
||||||
.both
|
.both
|
||||||
= f.check_box :auto_publish
|
= f.check_box :auto_publish
|
||||||
= f.label :auto_publish
|
= f.label :auto_publish
|
||||||
.both
|
|
||||||
= f.check_box :build_requires
|
|
||||||
= f.label :build_requires
|
|
||||||
- if BuildList.has_access_to_new_core?(current_user)
|
- if BuildList.has_access_to_new_core?(current_user)
|
||||||
.both
|
.both
|
||||||
= f.check_box :new_core
|
= f.check_box :new_core
|
||||||
|
|
|
@ -41,9 +41,6 @@
|
||||||
- else
|
- else
|
||||||
= @build_list.update_type
|
= @build_list.update_type
|
||||||
.both
|
.both
|
||||||
.leftlist= t("activerecord.attributes.build_list.build_requires")
|
|
||||||
.rightlist= t("layout.#{@build_list.build_requires}_")
|
|
||||||
.both
|
|
||||||
.leftlist= t("activerecord.attributes.build_list.auto_publish")
|
.leftlist= t("activerecord.attributes.build_list.auto_publish")
|
||||||
.rightlist= t("layout.#{@build_list.auto_publish}_")
|
.rightlist= t("layout.#{@build_list.auto_publish}_")
|
||||||
.both
|
.both
|
||||||
|
|
|
@ -22,7 +22,6 @@ en:
|
||||||
save_to_repository: Save to repository
|
save_to_repository: Save to repository
|
||||||
build_for_platform: Build for platform
|
build_for_platform: Build for platform
|
||||||
update_type: Update type
|
update_type: Update type
|
||||||
build_requires: Build with all the required packages
|
|
||||||
auto_publish: Automated publising
|
auto_publish: Automated publising
|
||||||
project_version: Version
|
project_version: Version
|
||||||
user: User
|
user: User
|
||||||
|
|
|
@ -22,7 +22,6 @@ ru:
|
||||||
save_to_repository: Сохранить в репозиторий
|
save_to_repository: Сохранить в репозиторий
|
||||||
build_for_platform: Собрано для платформы
|
build_for_platform: Собрано для платформы
|
||||||
update_type: Критичность обновления
|
update_type: Критичность обновления
|
||||||
build_requires: Пересборка с зависимостями
|
|
||||||
auto_publish: Автоматическая публикация
|
auto_publish: Автоматическая публикация
|
||||||
project_version: Версия
|
project_version: Версия
|
||||||
user: Пользователь
|
user: Пользователь
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class RemoveBuildRequiresFromBuildList < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
remove_column :build_lists, :build_requires
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
add_column :build_lists, :build_requires, :boolean, :default => false
|
||||||
|
end
|
||||||
|
end
|
|
@ -8,7 +8,6 @@ FactoryGirl.define do
|
||||||
association :arch
|
association :arch
|
||||||
build_for_platform {|bl| bl.save_to_platform}
|
build_for_platform {|bl| bl.save_to_platform}
|
||||||
save_to_repository {|bl| bl.save_to_platform.repositories.first}
|
save_to_repository {|bl| bl.save_to_platform.repositories.first}
|
||||||
build_requires true
|
|
||||||
update_type 'security'
|
update_type 'security'
|
||||||
include_repos {|bl| bl.save_to_platform.repositories.map(&:id)}
|
include_repos {|bl| bl.save_to_platform.repositories.map(&:id)}
|
||||||
project_version 'latest_master'
|
project_version 'latest_master'
|
||||||
|
|
Loading…
Reference in New Issue