Skip to content

Commit 277b46d

Browse files
authored
Merge pull request #269 from rspec/update-rspec-ci-flag
Update rspec ci flag
2 parents 440582b + 4779aa6 commit 277b46d

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Rakefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,8 @@ def force_update(branch, custom_pr_comment, skip_confirmation=false, opts={})
578578
end
579579

580580
def update_files_in_repos(purpose, suffix='', opts={})
581-
branch_name = "update-#{purpose.gsub ' ', '-'}-#{ENV.fetch('BRANCH_DATE',Date.today.iso8601)}-for-#{BASE_BRANCH}"
581+
suffix = [BASE_BRANCH, ENV['BRANCH_SUFFIX']].join('-')
582+
branch_name = "update-#{purpose.gsub ' ', '-'}-#{ENV.fetch('BRANCH_DATE',Date.today.iso8601)}-for-#{suffix}"
582583

583584
each_project_with_common_build(opts) do |proj|
584585
assert_clean_git_status(proj)

ci/.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
pull_request:
99
branches:
1010
- '*'
11+
env:
12+
RSPEC_CI: true
13+
# This tells rspec-rails what branch to run in ci
14+
RSPEC_VERSION: '= 3.11.0.pre'
1115
jobs:
1216
test:
1317
name: Ruby ${{ matrix.ruby }} ${{ matrix.name_extra || '' }}

0 commit comments

Comments
 (0)