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

Commit

Permalink
Merge pull request #499 from rspec/update-ci-build-scripts-2021-04-23…
Browse files Browse the repository at this point in the history
…-for-main

Updates from rspec-dev (2021-04-23)
  • Loading branch information
JonRowe authored Apr 23, 2021
2 parents d04c8ae + 3a62efa commit d63133f
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

name: RSpec CI
Expand All @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
ruby:
- 3.0
- '3.0'
- 2.7
- 2.6
- 2.5
Expand Down Expand Up @@ -83,20 +83,20 @@ jobs:
tag: rspec/ci:1.9.3
- version: "1.9.2"
tag: rspec/ci:1.9.2
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
- version: "1.8.7"
tag: rspec/ci:1.8.7
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
- version: "REE"
tag: rspec/ci:ree
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
- version: "JRuby 1.7"
tag: rspec/ci:jruby-1.7
- version: "JRuby 1.7 1.8 mode"
tag: rspec/ci:jruby-1.7
jruby_opts: '--dev --1.8'
pre: gem uninstall jruby-openssl
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
env:
LEGACY_CI: true
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# This file contains defaults for RSpec projects. Individual projects
Expand Down
2 changes: 1 addition & 1 deletion script/ci_functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# Taken from:
Expand Down
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

function is_mri {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
7 changes: 1 addition & 6 deletions script/update_rubygems_and_install_bundler
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
# This file was generated on 2021-04-23T09:17:32+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand All @@ -13,8 +13,3 @@ else
gem update --system '2.7.8'
gem install bundler -v '1.17.3'
fi

echo "Setup complete"
ruby -v
gem -v
bundler -v

0 comments on commit d63133f

Please sign in to comment.