Skip to content
代码片段 群组 项目
未验证 提交 a8d26c65 编辑于 作者: Dylan Griffith's avatar Dylan Griffith 提交者: GitLab
浏览文件

Minor fixes for `Keeps::OverdueFinalizeBackgroundMigration` in CI

上级 6d995686
No related branches found
No related tags found
无相关合并请求
...@@ -30,7 +30,9 @@ def with_branch_from_branch ...@@ -30,7 +30,9 @@ def with_branch_from_branch
yield yield
ensure ensure
Shell.execute("git", "checkout", current_branch) # The `current_branch` won't be set in CI due to how the repo is cloned. Therefore we should only checkout
# `current_branch` if we actually have one.
Shell.execute("git", "checkout", current_branch) if current_branch.present?
Shell.execute('git', 'stash', 'pop') if stashed Shell.execute('git', 'stash', 'pop') if stashed
end end
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
require_relative '../config/environment' require_relative '../config/environment'
require_relative '../lib/generators/post_deployment_migration/post_deployment_migration_generator' require_relative '../lib/generators/post_deployment_migration/post_deployment_migration_generator'
require_relative './helpers/postgres_ai' require_relative './helpers/postgres_ai'
require 'rubocop'
module Keeps module Keeps
# This is an implementation of a ::Gitlab::Housekeeper::Keep. This keep will locate any old batched background # This is an implementation of a ::Gitlab::Housekeeper::Keep. This keep will locate any old batched background
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册