Skip to content

Commit e8e3450

Browse files
authored
Merge pull request #9260 from ruby/merge-head-ci
Merge CI for development branches into ruby-core CI
2 parents 22d7462 + ca7925f commit e8e3450

3 files changed

Lines changed: 15 additions & 122 deletions

File tree

.github/workflows/daily-bundler.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/daily-rubygems.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/ruby-core.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,29 @@ permissions: # added using https://github.com/step-security/secure-workflows
1616

1717
jobs:
1818
ruby_core:
19-
name: ${{matrix.target}} under a ruby-core setup
19+
name: ${{matrix.target}} under a ruby-core / ${{matrix.branch}}
2020
runs-on: ubuntu-24.04
2121
strategy:
2222
fail-fast: false
2323
matrix:
2424
target: [Rubygems, Bundler]
25+
branch: [ruby_3_4, ruby_4_0, master]
2526
steps:
2627
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2728
with:
2829
repository: ruby/ruby
2930
path: ruby/ruby
30-
ref: v3_4_5
31+
ref: ${{ matrix.branch }}
3132
persist-credentials: false
33+
- uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
34+
with:
35+
ruby-version: 3.4
36+
bundler: none
3237
- name: Install libraries
3338
run: |
3439
set -x
3540
sudo apt-get update -q || :
36-
sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
41+
sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf
3742
- name: Build Ruby
3843
run: |
3944
export GNUMAKEFLAGS="-j$((1 + $(nproc)))"
@@ -43,8 +48,14 @@ jobs:
4348
working-directory: ruby/ruby
4449
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4550
with:
46-
path: rubygems/rubygems # We need to backport repository url to sync_default_gems.rb of `ruby_3_4` branch.
51+
path: rubygems/rubygems
52+
persist-credentials: false
53+
if: matrix.branch == 'ruby_3_4'
54+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
55+
with:
56+
path: ruby/rubygems
4757
persist-credentials: false
58+
if: matrix.branch != 'ruby_3_4'
4859
- name: Sync tools
4960
run: |
5061
ruby tool/sync_default_gems.rb rubygems

0 commit comments

Comments
 (0)