Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix application generation #5765

Merged
merged 3 commits into from
Jul 1, 2022
Merged

Fix application generation #5765

merged 3 commits into from
Jul 1, 2022

Conversation

dlpierce
Copy link
Contributor

@dlpierce dlpierce commented Jul 1, 2022

Changes proposed in this pull request:

  • Restore .engine_cart.yml that was deleted while trying to address issues with newly generated Rails 6 applications. It now includes --skip-javascript needed for Rails 6.
  • Remove some lines from the hyrax install generator that are handled by blacklight's installer.
  • Install yarn packages after installing universal viewer.
  • Specify a format for the .regen file to avoid inadvertently reusing a number which could cause an old cached .internal_test_app to be used for CI.

Guidance for testing, such as acceptance criteria or new user interface behaviors:

  • Specs pass after a rebuild of the CI .internal_test_app is triggered. This was done as part of this PR.

@dlpierce
Restore .engine_cart.yml
71c9bb9 
.engine_cart.yml was deleted while trying to address issues with newly generated Rails 6 applications. However, due to the way engine_cart loads its rails_options configuration, this file may have inadvertently been used for CircleCI builds, despite .circle/config.yml having an ENV variable with additional options. This tests that theory.
@dlpierce
Remove lines inserted by the blacklight install generator
7a2d11b
@dlpierce
Bump regen and use date formatting to avoid unintentional reuse
f90a885
@bwatson78 bwatson78 merged commit b680672 into main Jul 1, 2022
@bwatson78 bwatson78 deleted the test_ci_engine_cart_rails_options branch July 1, 2022 16:56
dunn
dunn reviewed Jul 1, 2022
View reviewed changes
.regen Show resolved Hide resolved
@dlpierce dlpierce added the notes-bugfix Release Notes: Fixed a bug label Jul 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dunn dunn dunn left review comments

@bwatson78 bwatson78 bwatson78 approved these changes

Assignees
No one assigned
Labels
notes-bugfix Release Notes: Fixed a bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dlpierce @dunn @bwatson78