Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit bb97af8

Browse files
authored
Merge pull request #2782 from rspec/update-ci-build-scripts-2020-11-16-for-main
Updates from rspec-dev (2020-11-16)
2 parents 32d2150 + 002d511 commit bb97af8

File tree

10 files changed

+19
-15
lines changed

10 files changed

+19
-15
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
name: RSpec CI
5-
on: [pull_request, push]
5+
on:
6+
push:
7+
branches:
8+
- 'main'
9+
- '*-maintenance'
10+
- '*-dev'
11+
pull_request:
12+
branches:
13+
- '*'
614
jobs:
715
test:
816
name: Ruby ${{ matrix.ruby }}
@@ -28,10 +36,6 @@ jobs:
2836
bundler: ${{ (matrix.ruby == 'jruby-9.1.17.0' && 1) || 2 }}
2937
ruby-version: ${{ matrix.ruby }}
3038
bundler-cache: true
31-
- uses: actions/cache@v2
32-
with:
33-
path: ../bundle
34-
key: ${{ runner.os }}-${{ matrix.ruby }}
3539
- run: script/update_rubygems_and_install_bundler
3640
- run: script/clone_all_rspec_repos
3741
- run: bundle install --binstubs --standalone

.rubocop_rspec_base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# In order to install old Rubies, we need to use old Ubuntu distibution.

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: "{build}"

script/ci_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {

script/run_build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/update_rubygems_and_install_bundler

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-11-16T22:10:29+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

0 commit comments

Comments
 (0)