Skip to content

Commit 4b867a8

Browse files
authored
Merge branch 'master' into feature/shyouhei/dot.github/workflows/compilers.yml
2 parents d78bcc9 + 0c25eb4 commit 4b867a8

File tree

1,677 files changed

+28615
-111441
lines changed

Some content is hidden

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

1,677 files changed

+28615
-111441
lines changed

.document

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ array.rb
1515
ast.rb
1616
dir.rb
1717
gc.rb
18+
hash.rb
1819
io.rb
1920
kernel.rb
2021
marshal.rb

.gdbinit

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
set startup-with-shell off
2-
31
define hook-run
42
set $color_type = 0
53
set $color_highlite = 0
@@ -1345,3 +1343,6 @@ define print_flags
13451343
end
13461344

13471345
source -s misc/gdb.py
1346+
1347+
# Moved from beginning, since it fails on older gdbs
1348+
set startup-with-shell off

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
# Expand tabs
77
5b21e94bebed90180d8ff63dad03b8b948361089
88
c5e9af9c9d890578182a21e7b71b50334cd5579e
9+
e63a2115f64433b21cb5dd67c5bf8b30f87ef293
10+
712ac99e4d0384a941c80a9f48f62943ba7d97c0
11+
d1474affa8e105bece209cc9d594bb0a989859e1
912

1013
# Enable Style/StringLiterals cop for RubyGems/Bundler
1114
d7ffd3fea402239b16833cc434404a7af82d44f3

.github/actions/launchable/setup/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ runs:
6363
${{
6464
(github.repository == 'ruby/ruby' ||
6565
(github.repository != 'ruby/ruby' && env.LAUNCHABLE_TOKEN)) &&
66-
(matrix.test_task == 'check' || matrix.test_task == 'test-all')
66+
(inputs.test-task == 'check' ||
67+
inputs.test-task == 'test-all' ||
68+
inputs.test-task == 'test')
6769
}}
6870
6971
# Launchable CLI requires Python and Java.

.github/actions/setup/directories/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ runs:
8888
git config --global init.defaultBranch garbage
8989
9090
- if: inputs.checkout
91-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
91+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
9292
with:
9393
path: ${{ inputs.srcdir }}
9494
fetch-depth: ${{ inputs.fetch-depth }}

.github/workflows/annocheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
|| contains(github.event.pull_request.title, '[DOC]')
4444
|| contains(github.event.pull_request.title, 'Document')
4545
|| contains(github.event.pull_request.labels.*.name, 'Document')
46-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
46+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4747
)}}
4848
4949
env:
@@ -74,7 +74,7 @@ jobs:
7474
builddir: build
7575
makeup: true
7676

77-
- uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
77+
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
7878
with:
7979
ruby-version: '3.0'
8080
bundler: none

.github/workflows/baseruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
|| contains(github.event.pull_request.title, '[DOC]')
4040
|| contains(github.event.pull_request.title, 'Document')
4141
|| contains(github.event.pull_request.labels.*.name, 'Document')
42-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
42+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4343
)}}
4444
4545
strategy:
@@ -51,7 +51,7 @@ jobs:
5151
- ruby-3.3
5252

5353
steps:
54-
- uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
54+
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
5555
with:
5656
ruby-version: ${{ matrix.ruby }}
5757
bundler: none

.github/workflows/bundled_gems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
timeout-minutes: 30
104104
env:
105105
RUBY_TESTOPTS: '-q --tty=no'
106-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
106+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
107107
if: ${{ steps.diff.outputs.gems }}
108108

109109
- name: Commit

.github/workflows/check_dependencies.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
|| contains(github.event.pull_request.title, '[DOC]')
4242
|| contains(github.event.pull_request.title, 'Document')
4343
|| contains(github.event.pull_request.labels.*.name, 'Document')
44-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
44+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4545
)}}
4646
4747
steps:
@@ -55,7 +55,7 @@ jobs:
5555

5656
- uses: ./.github/actions/setup/directories
5757

58-
- uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
58+
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
5959
with:
6060
ruby-version: '3.0'
6161
bundler: none
@@ -65,6 +65,8 @@ jobs:
6565

6666
- run: make all golf
6767

68+
- run: ./goruby -veh
69+
6870
- run: ruby tool/update-deps --fix
6971

7072
- run: git diff --no-ext-diff --ignore-submodules --exit-code

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
|| contains(github.event.pull_request.title, '[DOC]')
4646
|| contains(github.event.pull_request.title, 'Document')
4747
|| contains(github.event.pull_request.labels.*.name, 'Document')
48-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
48+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4949
)}}
5050
5151
env:
@@ -77,15 +77,15 @@ jobs:
7777
run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
7878

7979
- name: Initialize CodeQL
80-
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
80+
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
8181
with:
8282
languages: ${{ matrix.language }}
8383

8484
- name: Autobuild
85-
uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
85+
uses: github/codeql-action/autobuild@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
8686

8787
- name: Perform CodeQL Analysis
88-
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
88+
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
8989
with:
9090
category: '/language:${{ matrix.language }}'
9191
upload: False
@@ -115,7 +115,7 @@ jobs:
115115
continue-on-error: true
116116

117117
- name: Upload SARIF
118-
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
118+
uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
119119
with:
120120
sarif_file: sarif-results/${{ matrix.language }}.sarif
121121
continue-on-error: true

.github/workflows/compilers.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ jobs:
3939
|| contains(github.event.pull_request.title, '[DOC]')
4040
|| contains(github.event.pull_request.title, 'Document')
4141
|| contains(github.event.pull_request.labels.*.name, 'Document')
42-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
42+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
4343
)}}
4444
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
4545
steps:
4646
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4747
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
4848
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true } }
49-
- name: 'clang 16 LTO'
49+
- name: 'clang 18 LTO'
5050
uses: './.github/actions/compilers'
5151
with:
52-
tag: clang-16
53-
with_gcc: 'clang-16 -flto=auto'
52+
tag: clang-18
53+
with_gcc: 'clang-18 -flto=auto'
5454
optflags: '-O2'
5555
enable_shared: false
5656
- name: 'GCC 13 LTO'
@@ -192,7 +192,7 @@ jobs:
192192
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true } }
193193
- { uses: './.github/actions/compilers', name: '-O0', with: { optflags: '-O0 -march=x86-64 -mtune=generic' } }
194194
- { uses: './.github/actions/compilers', name: '-O3', with: { optflags: '-O3 -march=x86-64 -mtune=generic', check: true } }
195-
- { uses: './.github/actions/compilers', name: 'gmp', with: { append_configure: '--with-gmp', check: true } }
195+
- { uses: './.github/actions/compilers', name: 'gmp', with: { append_configure: '--with-gmp', check: 'ruby/test_bignum.rb' } }
196196
- { uses: './.github/actions/compilers', name: 'jemalloc', with: { append_configure: '--with-jemalloc' } }
197197
- { uses: './.github/actions/compilers', name: 'valgrind', with: { append_configure: '--with-valgrind' } }
198198
- { uses: './.github/actions/compilers', name: 'coroutine=ucontext', with: { append_configure: '--with-coroutine=ucontext' } }

.github/workflows/dependabot_automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
automerge:
88
runs-on: ubuntu-latest
99

10-
if: ${{ github.actor == 'dependabot[bot]' }}
10+
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
1111

1212
steps:
1313
- name: Dependabot metadata

.github/workflows/macos.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
|| contains(github.event.pull_request.title, '[DOC]')
5353
|| contains(github.event.pull_request.title, 'Document')
5454
|| contains(github.event.pull_request.labels.*.name, 'Document')
55-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
55+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
5656
)}}
5757
5858
steps:
@@ -80,6 +80,14 @@ jobs:
8080
sudo sysctl -w kern.coredump=1
8181
sudo chmod -R +rwx /cores/
8282
83+
- name: Delete unused SDKs
84+
# To free up disk space to not run out during the run
85+
run: |
86+
sudo rm -rf ~/.dotnet
87+
sudo rm -rf /Library/Android
88+
sudo rm -rf /Library/Developer/CoreSimulator
89+
continue-on-error: true
90+
8391
- name: Run configure
8492
run: ../src/configure -C --disable-install-doc ${ruby_configure_args}
8593

@@ -88,6 +96,18 @@ jobs:
8896

8997
- run: make
9098

99+
- run: |
100+
make golf
101+
case "${{ matrix.configure }}" in
102+
*'--enable-shared'*)
103+
make runnable
104+
./bin/goruby -veh
105+
;;
106+
*)
107+
./goruby -veh
108+
;;
109+
esac
110+
91111
- name: Set test options for skipped tests
92112
run: |
93113
set -x
@@ -108,7 +128,7 @@ jobs:
108128
- name: Set extra test options
109129
run: |
110130
echo "TESTS=$TESTS ${{ matrix.test_opts }}" >> $GITHUB_ENV
111-
echo "RUBY_TEST_TIMEOUT_SCALE=3" >> $GITHUB_ENV # With --repeat-count=2, flaky test by timeout occurs frequently for some reason
131+
echo "RUBY_TEST_TIMEOUT_SCALE=10" >> $GITHUB_ENV # With --repeat-count=2, flaky test by timeout occurs frequently for some reason
112132
if: matrix.test_opts
113133

114134
- name: make ${{ matrix.test_task }}
@@ -118,7 +138,7 @@ jobs:
118138
timeout-minutes: 60
119139
env:
120140
RUBY_TESTOPTS: '-q --tty=no'
121-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
141+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
122142
PRECHECK_BUNDLED_GEMS: 'no'
123143

124144
- name: make skipped tests

.github/workflows/mingw.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ jobs:
4848
matrix:
4949
include:
5050
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
51+
# Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x
5152
- msystem: 'UCRT64'
52-
baseruby: '3.0'
53+
baseruby: '3.2'
5354
test_task: 'check'
5455
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
5556
fail-fast: false
@@ -61,41 +62,37 @@ jobs:
6162
|| contains(github.event.pull_request.title, '[DOC]')
6263
|| contains(github.event.pull_request.title, 'Document')
6364
|| contains(github.event.pull_request.labels.*.name, 'Document')
64-
|| (github.event_name == 'push' && github.actor == 'dependabot[bot]')
65+
|| (github.event_name == 'push' && github.event.pull_request.user.login == 'dependabot[bot]')
6566
)}}
6667
6768
steps:
6869
- name: Set up Ruby & MSYS2
69-
uses: ruby/setup-ruby@161cd54b698f1fb3ea539faab2e036d409550e3c # v1.187.0
70+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
7071
with:
7172
ruby-version: ${{ matrix.baseruby }}
7273

73-
- name: where check
74+
- name: Misc system & package info
75+
working-directory:
7476
run: |
7577
# show where
76-
mv /c/Windows/System32/libcrypto-1_1-x64.dll /c/Windows/System32/libcrypto-1_1-x64.dll_
77-
mv /c/Windows/System32/libssl-1_1-x64.dll /c/Windows/System32/libssl-1_1-x64.dll_
7878
result=true
79-
for e in gcc.exe ragel.exe make.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do
79+
for e in gcc.exe ragel.exe make.exe libcrypto-3-x64.dll libssl-3-x64.dll; do
8080
echo ::group::$'\033[93m'$e$'\033[m'
8181
where $e || result=false
8282
echo ::endgroup::
8383
done
84-
$result
85-
working-directory:
86-
87-
- name: version check
88-
run: |
8984
# show version
90-
result=true
9185
for e in gcc ragel make "openssl version"; do
9286
case "$e" in *" "*) ;; *) e="$e --version";; esac
9387
echo ::group::$'\033[93m'$e$'\033[m'
9488
$e || result=false
9589
echo ::endgroup::
9690
done
91+
# show packages
92+
echo ::group::$'\033[93m'Packages$'\033[m'
93+
pacman -Qs mingw-w64-ucrt-x86_64-* | sed -n "s,local/mingw-w64-ucrt-x86_64-,,p"
94+
echo ::endgroup::
9795
$result
98-
working-directory:
9996
10097
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
10198
with:

0 commit comments

Comments
 (0)