Skip to content

Commit

Permalink
Merge pull request #4104 from rubygems/release/bundler_2.2.0_rubygems…
Browse files Browse the repository at this point in the history
…_3.2.0

Prepare stable branch to rubygems 3.2.0 & bundler 2.2.0
  • Loading branch information
deivid-rodriguez committed Dec 10, 2020
2 parents 948b579 + 978ecd3 commit d3628e5
Show file tree
Hide file tree
Showing 973 changed files with 4,078 additions and 2,317 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/daily-bundler.yml
Expand Up @@ -7,9 +7,7 @@ on:
jobs:
daily_bundler:
runs-on: ubuntu-18.04
strategy:
matrix:
ruby: [ ruby-head ]
if: github.repository == 'rubygems/rubygems'
env:
RGV: ..
steps:
Expand All @@ -18,7 +16,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
ruby-version: ruby-head
bundler: none

- name: Show Ruby version
Expand All @@ -37,7 +35,7 @@ jobs:

- name: Get previous status
if: always()
run: echo "::set-env name=OLD_STATUS::$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/runs?event=schedule&branch=master' | jq '.workflow_runs | map(select(.workflow_id == 982279)) | .[0].conclusion')"
run: echo "OLD_STATUS=$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/workflows/daily-bundler.yml/runs?event=schedule&branch=master' | jq '.workflow_runs | .[1].conclusion')" >> $GITHUB_ENV

- uses: 8398a7/action-slack@v3
with:
Expand Down
@@ -1,13 +1,15 @@
name: daily
name: daily-rubygems

on:
schedule:
- cron: '0 0 * * *'

jobs:
daily:
daily_rubygems:
runs-on: ubuntu-18.04
if: github.repository == 'rubygems/rubygems'
strategy:
fail-fast: false
matrix:
ruby: [ ruby-head, truffleruby-head ]
env:
Expand All @@ -31,7 +33,7 @@ jobs:
- name: Get previous status
if: always()
run: echo "::set-env name=OLD_STATUS::$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/runs?event=schedule&branch=master' | jq '.workflow_runs | map(select(.workflow_id == 716807)) | .[0].conclusion')"
run: echo "OLD_STATUS=$(curl -sS 'https://api.github.com/repos/rubygems/rubygems/actions/workflows/daily-rubygems.yml/runs?event=schedule&branch=master' | jq '.workflow_runs | .[1].conclusion')" >> $GITHUB_ENV

- uses: 8398a7/action-slack@v3
with:
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/install-rubygems.yml
@@ -0,0 +1,73 @@
name: install-rubygems

on:
pull_request:

push:
branches:
- master
- 3.2

jobs:
install_rubygems_ubuntu:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2, jruby-9.2.11.1 ]
openssl: [true, false]
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: none
- name: Install rubygems
run: ruby -Ilib -S rake install 2> errors.txt
- name: Check rubygems install produced no warnings
run: test ! -s errors.txt || (cat errors.txt && exit 1)
- name: Run a local rubygems command
run: gem list bundler
env:
RUBYOPT: -Itest/rubygems/fake_certlib
if: matrix.openssl == false
- name: Run a local rubygems command
run: gem list bundler
if: matrix.openssl == true
- name: Run a remote rubygems command
run: gem outdated
if: matrix.openssl == true
- name: Run bundler installed as a default gem
run: bundle --version
- name: Check bundler man pages were installed and are properly picked up
run: bundle install --help | grep -q BUNDLE-INSTALL
- name: Check bundler fallback man pages are properly picked up
run: sudo rm $(which man) && bundle install --help
- name: Build bundler
run: gem build bundler.gemspec
working-directory: ./bundler
- name: Install built bundler
run: gem install bundler-*.gem --verbose > output.txt
working-directory: ./bundler
- name: Check bundler install didn't hit the network
run: if grep -q 'GET http' output.txt; then false; else true; fi
working-directory: ./bundler
timeout-minutes: 10

install_rubygems_windows:
runs-on: windows-2019
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.2
bundler: none
- name: Install rubygems
run: ruby setup.rb
shell: bash
- name: Check installation didn't modify gemspec line feeds
run: ruby -Ilib -e'exit 1 if File.readlines("bundler/bundler.gemspec").first.end_with?("\r\n")'
shell: bash
timeout-minutes: 10
41 changes: 0 additions & 41 deletions .github/workflows/install.yml

This file was deleted.

@@ -1,4 +1,4 @@
name: macos
name: macos_rubygems

on:
pull_request:
Expand All @@ -9,11 +9,12 @@ on:
- 3.2

jobs:
macos:
macos_rubygems:
runs-on: macos-10.15
strategy:
fail-fast: false
matrix:
ruby: [ 2.4.10, 2.5.8, 2.6.6, 2.7.1 ]
ruby: [ 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
steps:
- uses: actions/checkout@v2
- name: Setup ruby
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/monthly.yml

This file was deleted.

67 changes: 67 additions & 0 deletions .github/workflows/older-rubygems-bundler.yml
@@ -0,0 +1,67 @@
name: older-rubygems-bundler

on:
pull_request:
paths:
- bundler/**
- .github/workflows/older-rubygems-bundler.yml
- .rubocop_bundler.yml

push:
branches:
- master
- 3.2

jobs:
older_rubygems_bundler:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.8, v3.1.4 ]
bundler: [ '' ]
exclude:
- { bundler: '', ruby: 2.4.10, rgv: v2.5.2 }
- { bundler: '', ruby: 2.5.8, rgv: v2.5.2 }
- { bundler: '', ruby: 2.5.8, rgv: v2.6.14 }
- { bundler: '', ruby: 2.6.6, rgv: v2.5.2 }
- { bundler: '', ruby: 2.6.6, rgv: v2.6.14 }
- { bundler: '', ruby: 2.6.6, rgv: v2.7.10 }
- { bundler: '', ruby: 2.7.2, rgv: v2.5.2 }
- { bundler: '', ruby: 2.7.2, rgv: v2.6.14 }
- { bundler: '', ruby: 2.7.2, rgv: v2.7.10 }
- { bundler: '', ruby: 2.7.2, rgv: v3.0.8 }
include:
- { bundler: 3.0.0, ruby: 2.4.10, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.5.8, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.6.6, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.7.2, rgv: v3.1.4 }
env:
RGV: ${{ matrix.rgv }}
RUBYOPT: --disable-gems
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: none
- name: Install graphviz
run: sudo apt-get install graphviz -y
if: matrix.bundler == ''
- name: Replace version
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler }} bin/rake override_version
if: matrix.bundler != ''
working-directory: ./bundler
- name: Prepare dependencies
run: |
bin/rake spec:parallel_deps
working-directory: ./bundler
- name: Run Test
run: |
bin/rake spec:all
working-directory: ./bundler
timeout-minutes: 60
3 changes: 2 additions & 1 deletion .github/workflows/ruby-core.yml
Expand Up @@ -12,6 +12,7 @@ jobs:
ruby_core:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
target: [rubygems, bundler]
steps:
Expand All @@ -21,7 +22,7 @@ jobs:
ruby-version: head
bundler: none
- name: Save latest buildable revision to environment
run: echo "::set-env name=REF::$(ruby -v | cut -d')' -f1 | cut -d' ' -f5)"
run: echo "REF=$(ruby -v | cut -d')' -f1 | cut -d' ' -f5)" >> $GITHUB_ENV
- uses: actions/checkout@v2
with:
repository: ruby/ruby
Expand Down
35 changes: 5 additions & 30 deletions .github/workflows/ubuntu-bundler.yml
Expand Up @@ -12,42 +12,17 @@ jobs:
ubuntu_bundler:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.1 ]
rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.8, v3.1.4, .. ]
bundler: [ '' ]
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
bundler: [ '', 3.0.0 ]
exclude:
- { bundler: '', ruby: 2.4.10, rgv: v2.5.2 }
- { bundler: '', ruby: 2.5.8, rgv: v2.5.2 }
- { bundler: '', ruby: 2.5.8, rgv: v2.6.14 }
- { bundler: '', ruby: 2.6.6, rgv: v2.5.2 }
- { bundler: '', ruby: 2.6.6, rgv: v2.6.14 }
- { bundler: '', ruby: 2.6.6, rgv: v2.7.10 }
- { bundler: '', ruby: 2.7.1, rgv: v2.5.2 }
- { bundler: '', ruby: 2.7.1, rgv: v2.6.14 }
- { bundler: '', ruby: 2.7.1, rgv: v2.7.10 }
- { bundler: '', ruby: 2.7.1, rgv: v3.0.8 }
include:
- { bundler: 3.0.0, ruby: 2.4.10, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.4.10, rgv: .. }
- { bundler: 3.0.0, ruby: 2.5.8, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.5.8, rgv: .. }
- { bundler: 3.0.0, ruby: 2.6.6, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.6.6, rgv: .. }
- { bundler: 3.0.0, ruby: 2.7.1, rgv: v3.1.4 }
- { bundler: 3.0.0, ruby: 2.7.1, rgv: .. }
- { bundler: 3.0.0, ruby: 2.3.8 }
env:
RGV: ${{ matrix.rgv }}
RGV: ..
RUBYOPT: --disable-gems
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
if: matrix.rgv != '..'
- uses: actions/checkout@v2
with:
fetch-depth: 1
if: matrix.rgv == '..'
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-lint.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.1
ruby-version: 2.7.2
bundler: none
- name: Install Dependencies
run: rake setup
Expand Down
@@ -1,4 +1,4 @@
name: ubuntu
name: ubuntu-rubygems

on:
pull_request:
Expand All @@ -9,11 +9,14 @@ on:
- 3.2

jobs:
ubuntu:
ubuntu_rubygems:
runs-on: ubuntu-18.04
strategy:
fail-fast: false
matrix:
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.1, jruby-9.2.11.1 ]
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2, jruby-9.2.11.1, truffleruby-20.2.0 ]
env:
TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
steps:
- uses: actions/checkout@v2
- name: Setup ruby
Expand Down

0 comments on commit d3628e5

Please sign in to comment.