Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare stable branch to rubygems 3.2.0 & bundler 2.2.0 #4104

Merged
merged 80 commits into from Dec 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
c871fba
Merge pull request #3786 from rubygems/fix_daily_notifications
deivid-rodriguez Jul 6, 2020
b882029
Merge pull request #3798 from rubygems/workflow_naming_convention
deivid-rodriguez Jul 9, 2020
cdc3c31
Merge pull request #3808 from rubygems/remove_style_changes_from_chan…
deivid-rodriguez Jul 10, 2020
b4acd69
Merge pull request #3813 from rubygems/fix_daily_workflow_false_posit…
deivid-rodriguez Jul 11, 2020
5e81bcd
Merge pull request #3776 from rubygems/optimize_ci
deivid-rodriguez Jul 13, 2020
4a0fec4
Merge pull request #3865 from rubygems/allow-no-etag
duckinator Aug 1, 2020
3456a9e
Merge pull request #3817 from eregon/improve-platform-check
indirect Aug 6, 2020
7941304
Merge pull request #3825 from rubygems/trailing_comma
hsbt Aug 6, 2020
e550b80
Merge pull request #3891 from eregon/truffleruby-20.2.0
hsbt Aug 24, 2020
5694eb1
Merge pull request #3910 from MSP-Greg/stop-daily
hsbt Aug 29, 2020
28b901e
Merge pull request #3919 from MSP-Greg/fix-daily-monthly
hsbt Aug 31, 2020
48e4a4c
Merge pull request #3913 from rubygems/fix_daily_bundler_workflow
deivid-rodriguez Aug 31, 2020
4757e2c
Merge pull request #3928 from rubygems/fix_man_check
deivid-rodriguez Sep 4, 2020
d20009f
Merge pull request #3923 from rubygems/stop_updating_man_pages_month
deivid-rodriguez Sep 4, 2020
a7087b7
Merge pull request #3938 from rubygems/add_tsort_as_an_unsupported_de…
deivid-rodriguez Sep 10, 2020
b4386df
Merge pull request #3906 from rubygems/fix_install_as_default_with_in…
deivid-rodriguez Sep 15, 2020
3febbca
Merge pull request #3850 from rubygems/openssl_one_more
deivid-rodriguez Sep 17, 2020
5747321
Merge pull request #3952 from rubygems/old_links
deivid-rodriguez Sep 17, 2020
a1d03f5
Merge pull request #3951 from andy-smith-msm/typo_squatting_triggered…
deivid-rodriguez Sep 25, 2020
21a4a4d
Merge pull request #3956 from andy-smith-msm/3955_sources_force_yes_no
deivid-rodriguez Sep 25, 2020
6a5a14a
Merge pull request #3974 from rubygems/fail_fast
deivid-rodriguez Sep 29, 2020
4d7829f
Merge pull request #3968 from rubygems/no_unnecessary_remote_requests
deivid-rodriguez Sep 29, 2020
b2bd23d
Merge pull request #3975 from rubygems/buildroot_windows
deivid-rodriguez Sep 30, 2020
69249f2
Merge pull request #3972 from rubygems/buildroot
deivid-rodriguez Oct 2, 2020
266ecc4
Merge pull request #3986 from rubygems/fix_specification_reset_warning
deivid-rodriguez Oct 2, 2020
a9453a5
Merge pull request #3980 from rubygems/no_bundler_gemspec_rewrite
deivid-rodriguez Oct 2, 2020
96b6412
Merge pull request #3988 from voxik/fix-file-not-found-gemspec-gemspec
deivid-rodriguez Oct 2, 2020
1cb68ff
Merge pull request #3498 from rubygems/thread_safe_extension_building
deivid-rodriguez Oct 6, 2020
a6dd09c
Merge pull request #3999 from rubygems/ruby_2_7_2
deivid-rodriguez Oct 7, 2020
6b9465d
Merge pull request #4006 from rubygems/fix-missing-require
hsbt Oct 8, 2020
90ab1b9
Merge pull request #4008 from rubygems/merge_stable_back
deivid-rodriguez Oct 9, 2020
830bd55
Merge pull request #3979 from rubygems/refactor_fake_gem_building
deivid-rodriguez Oct 9, 2020
fbdd478
Merge pull request #4010 from rubygems/lazily_load_default_gems
deivid-rodriguez Oct 12, 2020
61f05bf
Merge pull request #4011 from rubygems/lazily_load_erb
deivid-rodriguez Oct 12, 2020
0581728
Merge pull request #3991 from rubygems/fileutils_double_load
deivid-rodriguez Oct 14, 2020
2e508aa
Merge pull request #3997 from rubygems/better_man
deivid-rodriguez Oct 15, 2020
5d5e593
Merge pull request #4020 from rubygems/bring-back-support-for-path-in…
deivid-rodriguez Oct 16, 2020
032734f
Merge pull request #4021 from landongrindheim/add-gem-query-alternati…
deivid-rodriguez Oct 20, 2020
458d318
Merge pull request #3987 from eregon/fix_warn_stack_overflow2
deivid-rodriguez Oct 21, 2020
474e030
Merge pull request #4022 from rubygems/fix_package_all_specific_platf…
deivid-rodriguez Oct 22, 2020
d2537b5
Merge pull request #3402 from rubygems/molinillos_master
deivid-rodriguez Oct 22, 2020
3888948
Merge pull request #3388 from rubygems/bump_molinillo
deivid-rodriguez Oct 22, 2020
98498fd
Merge pull request #4023 from landongrindheim/move-description-into-q…
hsbt Oct 22, 2020
d55b6e4
Merge pull request #4029 from rubygems/pathname_unsupported
hsbt Oct 22, 2020
65e64aa
Merge pull request #4024 from rubygems/remove_bad_new_line
deivid-rodriguez Oct 23, 2020
648adc8
Merge pull request #3534 from djmarcin/fix-env-plugins
deivid-rodriguez Oct 23, 2020
a5a69b9
Merge pull request #4030 from rubygems/no_minimal_deps
deivid-rodriguez Oct 26, 2020
f274241
Merge pull request #4040 from rubygems/fix_ruby_core_intermittent_tes…
deivid-rodriguez Oct 27, 2020
41744f8
Merge pull request #4034 from rubygems/improve_bundle_gem_gemspec_deps
deivid-rodriguez Oct 28, 2020
47dfa5a
Merge pull request #4041 from r7kamura/feature/readme-empty-lines
hsbt Oct 28, 2020
a54a868
Merge pull request #4038 from rubygems/fix_drive_letter_windows_incon…
deivid-rodriguez Oct 29, 2020
5a19266
Merge pull request #4039 from rubygems/fix_incorrect_error_message_on…
deivid-rodriguez Oct 29, 2020
2ad0555
Merge pull request #4043 from rubygems/fix_gem_specification_platform…
deivid-rodriguez Oct 30, 2020
dddc3a6
Merge pull request #4042 from rubygems/another_cache_plus_specific_pl…
deivid-rodriguez Oct 30, 2020
0d60472
Merge pull request #4036 from rubygems/fileutils_require
deivid-rodriguez Oct 30, 2020
4c6fb22
Merge pull request #3123 from drcapulet/alexc-source-slash
deivid-rodriguez Oct 30, 2020
721576a
Merge pull request #3868 from rubygems/deprecate_server_command
bronzdoc Nov 2, 2020
243b185
Merge pull request #4054 from rubygems/lock-parallel-gem
hsbt Nov 9, 2020
b5e5896
Merge pull request #4045 from jlgoedert/improve_bundle_remove_comment…
deivid-rodriguez Nov 10, 2020
f6c1aeb
Merge pull request #4052 from rubygems/revert_automultiplatform_again
deivid-rodriguez Nov 10, 2020
250758c
Merge pull request #4019 from rubygems/improve_error_messages
deivid-rodriguez Nov 12, 2020
18de251
Merge pull request #3983 from rubygems/improve-c-flag
deivid-rodriguez Nov 12, 2020
35b3bdb
Merge pull request #3840 from sonalkr132/gem-signin-scope
deivid-rodriguez Nov 12, 2020
030920b
Merge pull request #4015 from rubygems/specific_platform_by_default
deivid-rodriguez Nov 12, 2020
abad8d1
Merge pull request #3886 from SeekingMeaning/all-platform-binstubs
deivid-rodriguez Nov 12, 2020
16fbf00
Merge pull request #4061 from rubygems/better_http_errors
deivid-rodriguez Nov 16, 2020
48afa8f
Merge pull request #4068 from rubygems/windows_ci
deivid-rodriguez Nov 17, 2020
9ccd2bc
Merge pull request #4066 from marcandre/new_gem_relative
deivid-rodriguez Nov 17, 2020
cff1683
Merge pull request #4062 from rubygems/zeitwerk
deivid-rodriguez Nov 18, 2020
79c7320
Merge pull request #4063 from rubygems/friendly_errors
deivid-rodriguez Nov 18, 2020
c9cdb92
Merge pull request #4079 from cotes2020/patch-1
deivid-rodriguez Nov 24, 2020
ebe55bd
Merge pull request #4084 from ayanko/bugfix-plugin-source-api-to-s
deivid-rodriguez Dec 1, 2020
4c03023
Merge pull request #4065 from rubygems/rootless_container
deivid-rodriguez Dec 1, 2020
22ea6f5
Merge pull request #4100 from sonalkr132/update-certs
hsbt Dec 7, 2020
aefb9de
Merge pull request #4096 from rubygems/delay_deprecation
deivid-rodriguez Dec 7, 2020
ee10fd6
Merge pull request #4075 from eregon/no-kernel-warn-monkey-patch
deivid-rodriguez Dec 7, 2020
b02a940
Merge pull request #4106 from rubygems/fix_test_failure_when_version_…
deivid-rodriguez Dec 7, 2020
d20e200
Bundler version 2.2.0 with changelog
deivid-rodriguez Dec 7, 2020
6cacdb9
Rubygems version 3.2.0 with changelog
deivid-rodriguez Dec 7, 2020
978ecd3
Merge pull request #4105 from sonalkr132/revert-globalsign
hsbt Dec 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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