Skip to content

Commit 1914a74

Browse files
authored
Merge pull request rails#52230 from stevepolitodesign/sp-ci-env
CI: Introduce `RAILS_MASTER_KEY` placeholder
2 parents e592dc1 + f0f0a81 commit 1914a74

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

railties/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Introduce `RAILS_MASTER_KEY` placeholder in generated ci.yml files
2+
3+
*Steve Polito*
4+
15
* Colorize the Rails console prompt even on non standard environments.
26

37
*Lorenzo Zabot*

railties/lib/rails/generators/rails/app/templates/github/ci.yml.tt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ jobs:
127127
<%- elsif options[:database] == "postgresql" -%>
128128
DATABASE_URL: postgres://postgres:postgres@localhost:5432
129129
<%- end -%>
130+
# RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
130131
# REDIS_URL: redis://localhost:6379/0
131132
<%- if options[:api] || options[:skip_system_test] -%>
132133
run: bin/rails db:test:prepare test

railties/lib/rails/generators/rails/plugin/templates/github/ci.yml.tt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
<%- elsif options[:database] == "postgresql" -%>
9292
DATABASE_URL: postgres://postgres:postgres@localhost:5432
9393
<%- end -%>
94+
# RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
9495
# REDIS_URL: redis://localhost:6379/0
9596
run: <%= test_command %>
9697

0 commit comments

Comments
 (0)