From 2d2dcf688ccc0a6fa93d196f0bb9cfe53122fa73 Mon Sep 17 00:00:00 2001 From: Jeremy Friesen Date: Tue, 4 Feb 2020 12:50:56 -0500 Subject: [PATCH] Modifying engine cart CI build parameterization At present, EngineCart's parsing of `.engine_cart.yml` will overwrite the `ENGINE_CART_RAILS_OPTIONS` set in CircleCI (see [cbeer/engine_cart/102][1] for some details). The present overwrite behavior is reasonable. As the removed `.engine_cart.yml` targeted pre-Rails 5 behavior, I opted to remove it. In doing so, this would now "activate" the `.circleci/config.yml` declaration of `ENGINE_CART_RAILS_OPTIONS`. As we have coffee script in Hyrax (for better or worse) and we have ActionCable usage, I needed to revisit the now activated parameters. The parameters to which I changed are the defaults of EngineCart (as of this PR). Note: This is in preparation for allowing PostgreSQL as the database for CircleCI. As this impacts the `.internal_test_app` generation, I also needed to bump the Regen number. TL;DR: A 4 year old file that we no longer need is silently trampling on a CI variable. That CI variable has likely not been used. It now will be used, but needed modifications to reflect that usage. _I hope this works, as iterating on the CI process is always time consuming as it requires coordination of remote resources._ [1]:https://github.com/cbeer/engine_cart/pull/102 --- .circleci/config.yml | 2 +- .engine_cart.yml | 1 - .regen | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 .engine_cart.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index f0f42174d6..735c730b6c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,7 +64,7 @@ jobs: environment: RAILS_VERSION: << parameters.rails_version >> NOKOGIRI_USE_SYSTEM_LIBRARIES: true - ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test + ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap steps: - attach_workspace: at: ~/ diff --git a/.engine_cart.yml b/.engine_cart.yml deleted file mode 100644 index a40bcc7616..0000000000 --- a/.engine_cart.yml +++ /dev/null @@ -1 +0,0 @@ -rails_options: "<%= '--skip-listen' if ENV.fetch('RAILS_VERSION', '') < '5.0' %>" \ No newline at end of file diff --git a/.regen b/.regen index 7ed6ff82de..ec635144f6 100644 --- a/.regen +++ b/.regen @@ -1 +1 @@ -5 +9