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.

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

Bullet Train Update: 1.6.18 #19

Merged
merged 46 commits into from
Nov 22, 2023
Merged

Bullet Train Update: 1.6.18 #19

merged 46 commits into from
Nov 22, 2023

Conversation

jagthedrummer
Copy link
Contributor

Update of the Bullet Train Starter Repo to version 1.6.18

Please note: You should thorougly review this PR.

⚠️ There are conflicts in the following files:

  • .github/workflows/_reusable_workflows.yml
  • .github/workflows/ci-cd-pipeline-bt-internal.yml
  • .github/workflows/ci-cd-pipeline-main.yml
  • .github/workflows/ci-cd-pipeline.yml

You should pull down this branch, resolve the conflicts, and then push the branch.

Get started by pulling the branch:

git fetch origin
git checkout -b bullet-train-update/1.6.18 --track origin/bullet-train-update/1.6.18

Then resolve conflicts. Once you have done that you can commit the changes and then push.

git add .
git commit -m "resolved conflicts"
git push origin bullet-train-update/1.6.18

Auto-generated by .github/workflows/update-bullet-train.yml

depfu bot and others added 30 commits October 24, 2023 06:17
When we do `bundle lock --update ...` that allows various dependencies
to float up to a new version if one has been released. This prevents
that from happening.

For instance in `bullet_train-api` we specify a dependency on
`jbuilder-schema` of `>= 2.4.0`. In `Gemfile.lock` of the starter repo
we had it set to `2.5.0`. But when `2.6.0` was released we started to
see failured in CI due to a bug. Since the version was just "floating"
to `2.6.0` in CI it wasn't immediately obvious that `jbuilder-schema`
was getting updated.

Ideally we want to see these kinds of failures when Dependabot generates
a PR to update our dependencies. In which case it would be much more
obvious that a new verison of a gem is being used.
* Try using build instead of create + rollback in ExampleBot

* linter

* Update example factories to match previous OpenAPI

* Add back something that was accidentally removed

---------

Co-authored-by: Yuri Sidorov <403994+newstler@users.noreply.github.com>
* Use Ruby 3.2.2 in gitpod.Dockerfile

* Install libipvs in Gitpods
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
* Add stimulus-scroll-reveal

* Add final markup for home page

* Remove unneeded CSS class in public index div

* Edit TODO in application system test case

* Make link to documentation lowercased

* Remove unneeded string interpolation

* Register ScrollReveal next to RevealController

* Move fade background markup from core to starter repo

* Change bg fade class, write home page link style inline

* Update yarn.lock

---------

Co-authored-by: Jeremy Green <jagthedrummer@gmail.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
* Remove collaborators example

* Remove Collborator resource from roles
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
…1154)

* Only update roles column if the collaborators example is available

* Use correct model name in migration
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
github-actions bot and others added 16 commits November 15, 2023 17:00
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
* Add CI/CD workflows for GitHub Actions

Fixes bullet-train-co/bullet_train#764
Partially addresses bullet-train-co/bullet_train#1010

* Don't auto-deploy by default

* Import a script

* Apparently localhost doesn't resolve on GitHub actions?

* this is better

* try to simplify the matrix setup

* need to quote these

* A little clean up and some train names

* Will it allow a blank name?

* nope, it wants a name

* typo:
'

* need a database for this one

* oops

* fail on error

* exit if the migrate command fails

* try this

* Move super scaffolding tests into a new workflow

* derp

* clean up

* this takes a long time

* Revert "this takes a long time"

This reverts commit 0d883224c1c7f70297a1492ae46e3738828a1d9d.

* Update .github/workflows/ci-cd-pipeline-main.yml

Co-authored-by: Kasper Timm Hansen <kaspth@gmail.com>

* Don't checkout code that we're not going to use

* Only run super scaffolding tests if we're in the starter repo

* shorten some names

---------

Co-authored-by: Kasper Timm Hansen <kaspth@gmail.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
* Avoid buggy versions of factory_bot_rails

There's a bug in the latest version of `factory_bot_rails`:
thoughtbot/factory_bot_rails#433

There's also a fix that hasn't been merged or released yet:
thoughtbot/factory_bot_rails#432

I'm setting the `Gemfile` to specifically avoid those buggy versions so
that we can get `depfu` un-blocked with keeping gems up to date.

* dang linter
Co-authored-by: jagthedrummer <jagthedrummer@users.noreply.github.com>
# Conflicts:
#	.github/workflows/_reusable_workflows.yml
#	.github/workflows/ci-cd-pipeline-bt-internal.yml
#	.github/workflows/ci-cd-pipeline-main.yml
#	.github/workflows/ci-cd-pipeline.yml
#	Gemfile.lock
@jagthedrummer jagthedrummer merged commit 5c5385d into main Nov 22, 2023
7 checks passed
@jagthedrummer jagthedrummer deleted the bullet-train-update/1.6.18 branch November 22, 2023 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants