From ee6c30d9893800839866f75996da7fa332601d98 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 11 Apr 2023 14:04:36 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev) main --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 8 +++++--- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 2 +- script/clone_all_rspec_repos | 2 +- script/cucumber.sh | 2 +- script/functions.sh | 2 +- script/legacy_setup.sh | 2 +- script/predicate_functions.sh | 2 +- script/run_build | 2 +- script/run_rubocop | 2 +- script/update_rubygems_and_install_bundler | 2 +- 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index fd728c92..965f39bf 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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. version: 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f568477..60b0ecc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 @@ -50,7 +50,6 @@ jobs: - 2.4 - 2.3 - 2.2 - - 2.1.9 env: - DIFF_LCS_VERSION: "> 1.4.3" @@ -94,6 +93,9 @@ jobs: fail-fast: false matrix: container: + - version: "2.1.9" + tag: ghcr.io/rspec/docker-ci:2.1.9 + post: git config --global --add safe.directory `pwd` - version: "2.0" tag: ghcr.io/rspec/docker-ci:2.0.0 - version: "1.9.3" @@ -124,6 +126,7 @@ jobs: - uses: actions/checkout@v3 - run: ${{ matrix.container.pre }} - run: script/legacy_setup.sh + - run: ${{ matrix.container.post }} - run: bundle exec bin/rspec - run: bundle exec script/cucumber.sh @@ -139,7 +142,6 @@ jobs: - 2.4 - 2.3 - 2.2 - - 2.1.9 fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 76bda324..82140fa6 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/ci_functions.sh b/script/ci_functions.sh index a8e9fe6d..626a2e3a 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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: diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos index 608ccd0a..8398e76b 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/cucumber.sh b/script/cucumber.sh index 4f3fc5a9..f9bea166 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/functions.sh b/script/functions.sh index f943d41c..b875ff58 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 )" diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh index e39a78e2..52380eb9 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh index 9ea89693..15eebe71 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 { diff --git a/script/run_build b/script/run_build index b44592d7..c2a139d7 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/run_rubocop b/script/run_rubocop index a8dfd685..3650ca6f 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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 diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index 7c9aec79..41ee46a5 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-03-16T20:30:35+00:00 from the rspec-dev repo. +# This file was generated on 2023-04-11T14:04:36+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