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

Commit 567325d

Browse files
JonRoweJonRowe
authored
Merge pull request #3028 from rspec/update-ci-build-scripts-2023-04-11-for-main
Updates from rspec-dev (2023-04-11)
2 parents d85cf3d + c8e79f6 commit 567325d

12 files changed

+16
-14
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-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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
@@ -50,7 +50,6 @@ jobs:
5050
- 2.4
5151
- 2.3
5252
- 2.2
53-
- 2.1.9
5453
env:
5554
-
5655
DIFF_LCS_VERSION: "> 1.4.3"
@@ -94,6 +93,9 @@ jobs:
9493
fail-fast: false
9594
matrix:
9695
container:
96+
- version: "2.1.9"
97+
tag: ghcr.io/rspec/docker-ci:2.1.9
98+
post: git config --global --add safe.directory `pwd`
9799
- version: "2.0"
98100
tag: ghcr.io/rspec/docker-ci:2.0.0
99101
- version: "1.9.3"
@@ -124,6 +126,7 @@ jobs:
124126
- uses: actions/checkout@v3
125127
- run: ${{ matrix.container.pre }}
126128
- run: script/legacy_setup.sh
129+
- run: ${{ matrix.container.post }}
127130
- run: bundle exec bin/rspec
128131
- run: bundle exec script/cucumber.sh
129132

@@ -139,7 +142,6 @@ jobs:
139142
- 2.4
140143
- 2.3
141144
- 2.2
142-
- 2.1.9
143145
fail-fast: false
144146
steps:
145147
- uses: actions/checkout@v3

‎.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-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
1+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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-03-16T20:30:35+00:00 from the rspec-dev repo.
2+
# This file was generated on 2023-04-11T14:04:33+01: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)