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

Updates from rspec-dev (2020-11-16) #2782

Merged
merged 1 commit into from
Nov 17, 2020
Merged

Updates from rspec-dev (2020-11-16) #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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
on: [pull_request, push]
on:
push:
branches:
- 'main'
- '*-maintenance'
- '*-dev'
pull_request:
branches:
- '*'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pirj @benoittgt this seems to work for pull requests at least with just one build, will need to push to a branch (probably maintenance to cherry-pick the config) to test it still builds pushes.

jobs:
test:
name: Ruby ${{ matrix.ruby }}
Expand All @@ -28,10 +36,6 @@ jobs:
bundler: ${{ (matrix.ruby == 'jruby-9.1.17.0' && 1) || 2 }}
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- uses: actions/cache@v2
with:
path: ../bundle
key: ${{ runner.os }}-${{ matrix.ruby }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being removed because it doesn't work, but bundle-cache: true does

- run: script/update_rubygems_and_install_bundler
- run: script/clone_all_rspec_repos
- run: bundle install --binstubs --standalone
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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.

# In order to install old Rubies, we need to use old Ubuntu distibution.
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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: "{build}"
Expand Down
2 changes: 1 addition & 1 deletion script/ci_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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/predicate_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.
# This file was generated on 2020-11-16T22:10:29+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