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 #1445 from rspec/update-ci-build-scripts-2023-12-2…
Browse files Browse the repository at this point in the history
…6-for-3-12-maintenance

Updates from rspec-dev (2023-12-26)
  • Loading branch information
JonRowe authored Dec 26, 2023
2 parents 1ee61c2 + 0812ff5 commit 21ed23c
Show file tree
Hide file tree
Showing 12 changed files with 17 additions and 16 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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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
9 changes: 5 additions & 4 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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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 All @@ -25,7 +25,7 @@ jobs:
name: Rubocop
runs-on: 'ubuntu-20.04'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
Expand All @@ -41,6 +41,7 @@ jobs:
strategy:
matrix:
ruby:
- '3.3'
- '3.2'
- '3.1'
- '3.0'
Expand Down Expand Up @@ -72,7 +73,7 @@ jobs:
continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
env: ${{ matrix.env }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler: ${{ matrix.bundler || '2.2.22' }}
Expand Down Expand Up @@ -144,7 +145,7 @@ jobs:
- 2.2
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
bundler: '2.2.22'
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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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
4 changes: 2 additions & 2 deletions 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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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 All @@ -12,7 +12,7 @@ if is_mri; then
clone_repo "rspec-core"
clone_repo "rspec-expectations"
clone_repo "rspec-mocks"
clone_repo "rspec-rails" "6-0-maintenance"
clone_repo "rspec-rails" "6-1-maintenance"

if rspec_support_compatible; then
clone_repo "rspec-support"
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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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-06-26T14:08:07+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-26T21:12:38+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 21ed23c

Please sign in to comment.