Commit a1e9c315 authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Re-create config files as part of gdk pristine

parent bd9e86292f10
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
BUNDLE_PRISTINE_CMD = 'bundle pristine' BUNDLE_PRISTINE_CMD = 'bundle pristine'
YARN_CLEAN_CMD = 'yarn clean' YARN_CLEAN_CMD = 'yarn clean'
GIT_CLEAN_TMP_CMD = 'git clean -fX -- tmp/' GIT_CLEAN_TMP_CMD = 'git clean -fX -- tmp/'
RESET_CONFIGS_CMD = 'make touch-examples reconfigure'
def run(_args = []) def run(_args = [])
%i[ %i[
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
gdk_tmp_clean gdk_tmp_clean
go_clean_cache go_clean_cache
gdk_bundle gdk_bundle
reset_configs
gitlab_bundle gitlab_bundle
gitaly_bundle gitaly_bundle
gitlab_tmp_clean gitlab_tmp_clean
...@@ -67,6 +69,10 @@ ...@@ -67,6 +69,10 @@
gdk_bundle_install && gdk_bundle_pristine gdk_bundle_install && gdk_bundle_pristine
end end
def reset_configs
shellout(RESET_CONFIGS_CMD, chdir: config.gdk_root)
end
def gdk_bundle_install def gdk_bundle_install
shellout(BUNDLE_INSTALL_CMD, chdir: config.gdk_root) shellout(BUNDLE_INSTALL_CMD, chdir: config.gdk_root)
end end
......
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
expect_shellout_command(described_class::BUNDLE_INSTALL_CMD, config.gdk_root).and_return(shellout_double) expect_shellout_command(described_class::BUNDLE_INSTALL_CMD, config.gdk_root).and_return(shellout_double)
expect_shellout_command(described_class::BUNDLE_PRISTINE_CMD, config.gdk_root).and_return(shellout_double) expect_shellout_command(described_class::BUNDLE_PRISTINE_CMD, config.gdk_root).and_return(shellout_double)
# reset_configs
expect_shellout_command(described_class::RESET_CONFIGS_CMD, config.gdk_root).and_return(shellout_double)
# gitlab_bundle # gitlab_bundle
expect_shellout_command(described_class::BUNDLE_INSTALL_CMD, config.gitlab.dir).and_return(shellout_double) expect_shellout_command(described_class::BUNDLE_INSTALL_CMD, config.gitlab.dir).and_return(shellout_double)
expect_shellout_command(described_class::BUNDLE_PRISTINE_CMD, config.gitlab.dir).and_return(shellout_double) expect_shellout_command(described_class::BUNDLE_PRISTINE_CMD, config.gitlab.dir).and_return(shellout_double)
......
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