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

Commit 41cb3b4

Browse files
JonRoweJonRowe
authored
Merge pull request #1537 from rspec/update-ci-build-scripts-2023-03-12-for-3-12-maintenance
Updates from rspec-dev (2023-03-12)
2 parents 08bcd3d + 86a1391 commit 41cb3b4

12 files changed

+15
-17
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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: 2

‎.github/workflows/ci.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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
@@ -61,11 +61,6 @@ jobs:
6161
- ruby: jruby-9.2.13.0
6262
env:
6363
JRUBY_OPTS: "--dev"
64-
- ruby: jruby-9.1.17.0
65-
bundler: 1
66-
os: ubuntu-18.04
67-
env:
68-
JRUBY_OPTS: "--dev"
6964
- ruby: 2.7
7065
name_extra: "with diff-lcs 1.3"
7166
env:
@@ -119,6 +114,9 @@ jobs:
119114
jruby_opts: '--dev --1.8'
120115
pre: gem uninstall jruby-openssl
121116
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
117+
- version: "JRuby 9.1.17.0"
118+
tag: rspec/ci:jruby-9.1.17.0
119+
options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
122120
env:
123121
LEGACY_CI: true
124122
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}

‎.rubocop_rspec_base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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

‎script/ci_functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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/cucumber.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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/legacy_setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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/predicate_functions.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
1+
# This file was generated on 2023-03-12T19:37:42+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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/run_rubocop

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-01-11T22:30:28+03:00 from the rspec-dev repo.
2+
# This file was generated on 2023-03-12T19:37:42+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)