Skip to content

Commit 529e536

Browse files
Merge pull request #4212 from rubygems/release/bundler_2.2.4_rubygems_3.2.4
Prepare bundler 2.2.4 & rubygems 3.2.4 releases
2 parents 29dc3c8 + 05bffe7 commit 529e536

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+686
-729
lines changed

.changelog.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
header_template: "=== %new_version / %release_date"
3+
header_template: "# %new_version / %release_date"
44

55
entry_template: "* %pull_request_title. Pull request #%pull_request_number by %pull_request_author"
66

@@ -9,14 +9,14 @@ release_date_format: "%Y-%m-%d"
99
entry_wrapping: 74
1010

1111
changelog_label_mapping:
12-
"rubygems: security fix": "Security fixes:"
13-
"rubygems: breaking change": "Breaking changes:"
14-
"rubygems: deprecation": "Deprecations:"
15-
"rubygems: feature": "Features:"
16-
"rubygems: performance": "Performance:"
17-
"rubygems: enhancement": "Enhancements:"
18-
"rubygems: bug fix": "Bug fixes:"
19-
"rubygems: documentation": "Documentation:"
12+
"rubygems: security fix": "## Security fixes:"
13+
"rubygems: breaking change": "## Breaking changes:"
14+
"rubygems: deprecation": "## Deprecations:"
15+
"rubygems: feature": "## Features:"
16+
"rubygems: performance": "## Performance:"
17+
"rubygems: enhancement": "## Enhancements:"
18+
"rubygems: bug fix": "## Bug fixes:"
19+
"rubygems: documentation": "## Documentation:"
2020
"rubygems: backport": null
2121

2222
patch_level_labels:

.github/workflows/install-rubygems.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
- { name: 2.6, value: 2.6.6 }
2323
- { name: 2.7, value: 2.7.2 }
2424
- { name: jruby-9.2, value: jruby-9.2.14.0 }
25+
- { name: truffleruby-20.2, value: truffleruby-20.2.0 }
2526
openssl:
2627
- { name: "openssl", value: true }
2728
- { name: "no-openssl", value: false }
@@ -33,7 +34,7 @@ jobs:
3334
ruby-version: ${{ matrix.ruby.value }}
3435
bundler: none
3536
- name: Install rubygems
36-
run: ruby -Ilib -S rake install 2> errors.txt
37+
run: ruby -Ilib -S rake install 2> errors.txt || (cat errors.txt && exit 1)
3738
- name: Check rubygems install produced no warnings
3839
run: test ! -s errors.txt || (cat errors.txt && exit 1)
3940
- name: Run a local rubygems command
@@ -51,8 +52,10 @@ jobs:
5152
run: bundle --version
5253
- name: Check bundler man pages were installed and are properly picked up
5354
run: bundle install --help | grep -q BUNDLE-INSTALL
55+
if: matrix.ruby.name != 'truffleruby-20.2'
5456
- name: Check bundler fallback man pages are properly picked up
5557
run: sudo rm $(which man) && bundle install --help
58+
if: matrix.ruby.name != 'truffleruby-20.2'
5659
- name: Build bundler
5760
run: gem build bundler.gemspec
5861
working-directory: ./bundler
@@ -64,22 +67,33 @@ jobs:
6467
working-directory: ./bundler
6568
- name: Check rails can be installed
6669
run: gem install rails
70+
if: matrix.ruby.name != 'truffleruby-20.2'
6771
timeout-minutes: 10
6872

6973
install_rubygems_windows:
70-
name: Install Rubygems on Windows
74+
name: Install Rubygems on Windows (${{ matrix.ruby.name }})
7175
runs-on: windows-2019
76+
strategy:
77+
fail-fast: false
78+
matrix:
79+
ruby:
80+
- { name: 2.7, value: 2.7.2 }
81+
- { name: jruby-9.2, value: jruby-9.2.14.0 }
7282
steps:
7383
- uses: actions/checkout@v2
7484
- name: Setup ruby
7585
uses: ruby/setup-ruby@v1
7686
with:
77-
ruby-version: 2.7.2
87+
ruby-version: ${{ matrix.ruby.value }}
7888
bundler: none
7989
- name: Install rubygems
8090
run: ruby setup.rb
8191
shell: bash
82-
- name: Check installation didn't modify gemspec line feeds
83-
run: ruby -Ilib -e'exit 1 if File.readlines("bundler/bundler.gemspec").first.end_with?("\r\n")'
92+
- name: Check installation didn't modify any source controlled files
93+
run: git diff --exit-code
8494
shell: bash
95+
- name: Check we can install a Gemfile with git sources
96+
run: bundle init && bundle add fileutils --git https://github.com/ruby/fileutils
97+
shell: bash
98+
8599
timeout-minutes: 10

0 commit comments

Comments
 (0)