Skip to content

Commit

Permalink
Merge pull request #567 from rspec/update-ci-build-scripts-2023-03-12…
Browse files Browse the repository at this point in the history
…-for-3-12-maintenance

Updates from rspec-dev (2023-03-12)
  • Loading branch information
JonRowe committed Mar 12, 2023
2 parents 7fdaef9 + aa5f200 commit 9ebc1ea
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

version: 2
Expand Down
10 changes: 4 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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 Down Expand Up @@ -61,11 +61,6 @@ jobs:
- ruby: jruby-9.2.13.0
env:
JRUBY_OPTS: "--dev"
- ruby: jruby-9.1.17.0
bundler: 1
os: ubuntu-18.04
env:
JRUBY_OPTS: "--dev"
- ruby: 2.7
name_extra: "with diff-lcs 1.3"
env:
Expand Down Expand Up @@ -119,6 +114,9 @@ jobs:
jruby_opts: '--dev --1.8'
pre: gem uninstall jruby-openssl
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
- version: "JRuby 9.1.17.0"
tag: rspec/ci:jruby-9.1.17.0
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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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/run_rubocop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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/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 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
# This file was generated on 2023-03-12T19:37:42+00: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

0 comments on commit 9ebc1ea

Please sign in to comment.