Skip to content

Commit 19e523d

Browse files
wkswks
authored
Merge pull request #31 from mmtk/merge-from-upstream
Merge from upstream
2 parents c718bdd + 29abdc7 commit 19e523d

File tree

142 files changed

+2850
-931
lines changed

Some content is hidden

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

142 files changed

+2850
-931
lines changed

‎.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ yjit_task:
129129
full_build_script: source $HOME/.cargo/env && make
130130
cargo_test_script: source $HOME/.cargo/env && cd yjit && cargo test
131131
make_test_script: source $HOME/.cargo/env && make test RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"
132-
make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1" TESTOPTS="$RUBY_TESTOPTS"
133-
make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1"
132+
make_test_all_script: source $HOME/.cargo/env && make test-all RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx" TESTOPTS="$RUBY_TESTOPTS"
133+
make_test_spec_script: source $HOME/.cargo/env && make test-spec RUN_OPTS="--yjit-call-threshold=1 --yjit-verify-ctx"

‎.github/workflows/baseruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ jobs:
5757
- run: make incs
5858
- run: make all
5959
- run: make test
60-
- uses: k0kubun/action-slack@v2.0.0
60+
- uses: ruby/action-slack@v3.0.0
6161
with:
6262
payload: |
6363
{
6464
"ci": "GitHub Actions",
6565
"env": "${{ github.workflow }} / BASERUBY @ ${{ matrix.ruby }}",
6666
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
6767
"commit": "${{ github.sha }}",
68-
"branch": "${{ github.ref }}".split('/').reverse()[0]
68+
"branch": "${{ github.ref_name }}"
6969
}
7070
env:
7171
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/check_dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ jobs:
5656
- run: make all golf
5757
- run: ruby tool/update-deps --fix
5858
- run: git diff --no-ext-diff --ignore-submodules --exit-code
59-
- uses: k0kubun/action-slack@v2.0.0
59+
- uses: ruby/action-slack@v3.0.0
6060
with:
6161
payload: |
6262
{
6363
"ci": "GitHub Actions",
6464
"env": "${{ matrix.os }} / Dependencies need to update",
6565
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
6666
"commit": "${{ github.sha }}",
67-
"branch": "${{ github.ref }}".split('/').reverse()[0]
67+
"branch": "${{ github.ref_name }}"
6868
}
6969
env:
7070
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/check_misc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ jobs:
9898
GIT_COMMITTER_NAME: git
9999
if: ${{ github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull') && steps.diff.outcome == 'failure' }}
100100

101-
- uses: k0kubun/action-slack@v2.0.0
101+
- uses: ruby/action-slack@v3.0.0
102102
with:
103103
payload: |
104104
{
105105
"ci": "GitHub Actions",
106106
"env": "${{ github.workflow }}",
107107
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
108108
"commit": "${{ github.sha }}",
109-
"branch": "${{ github.ref }}".split('/').reverse()[0]
109+
"branch": "${{ github.ref_name }}"
110110
}
111111
env:
112112
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/cirrus-notify.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
on:
2+
check_suite:
3+
type: ['completed']
4+
name: Cirrus CI failure notification
5+
jobs:
6+
cirrus-notify:
7+
name: After Cirrus CI Failure
8+
if: >-
9+
github.event.check_suite.app.name == 'Cirrus CI'
10+
&& github.event.check_suite.conclusion != 'success'
11+
&& github.event.check_suite.conclusion != 'cancelled'
12+
&& github.event.check_suite.conclusion != 'skipped'
13+
&& github.event.check_suite.head_branch == 'master'
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: octokit/[email protected]
17+
id: get_failed_check_run
18+
with:
19+
route: GET /repos/${{ github.repository }}/check-suites/${{ github.event.check_suite.id }}/check-runs?status=completed
20+
mediaType: '{"previews": ["antiope"]}'
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
- name: Dump GitHub context
24+
env:
25+
GITHUB_CONTEXT: ${{ toJson(github) }}
26+
run: echo "$GITHUB_CONTEXT"
27+
- name: Dump check_runs
28+
env:
29+
CHECK_RUNS: ${{ steps.get_failed_check_run.outputs.data }}
30+
run: echo "$CHECK_RUNS"
31+
- uses: ruby/[email protected]
32+
with:
33+
payload: |
34+
{
35+
"ci": "Cirrus CI",
36+
"env": "Cirrus CI",
37+
"url": "${{ fromJson(steps.get_failed_check_run.outputs.data).check_runs[0].html_url }}",
38+
"commit": "${{ github.event.check_suite.head_commit.id }}",
39+
"branch": "${{ github.event.check_suite.head_branch }}"
40+
}
41+
env:
42+
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/codeql-analysis.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
name: "Code scanning - action"
22

33
on:
4-
push:
5-
paths-ignore:
6-
- 'doc/**'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '**.[1-8]'
11-
- '**.ronn'
12-
pull_request:
13-
paths-ignore:
14-
- 'doc/**'
15-
- '**.md'
16-
- '**.rdoc'
17-
- '**/.document'
18-
- '**.[1-8]'
19-
- '**.ronn'
4+
# push:
5+
# paths-ignore:
6+
# - 'doc/**'
7+
# - '**.md'
8+
# - '**.rdoc'
9+
# - '**/.document'
10+
# - '**.[1-8]'
11+
# - '**.ronn'
12+
# pull_request:
13+
# paths-ignore:
14+
# - 'doc/**'
15+
# - '**.md'
16+
# - '**.rdoc'
17+
# - '**/.document'
18+
# - '**.[1-8]'
19+
# - '**.ronn'
2020
schedule:
21-
- cron: '0 12 * * 4'
21+
- cron: '0 12 * * *'
2222

2323
concurrency:
2424
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}

‎.github/workflows/compilers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,15 +268,15 @@ jobs:
268268
- run: make test-annocheck
269269
if: ${{ matrix.entry.check && endsWith(matrix.entry.name, 'annocheck') }}
270270

271-
- uses: k0kubun/action-slack@v2.0.0
271+
- uses: ruby/action-slack@v3.0.0
272272
with:
273273
payload: |
274274
{
275275
"ci": "GitHub Actions",
276276
"env": "${{ github.workflow }} / ${{ matrix.entry.name }}",
277277
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
278278
"commit": "${{ github.sha }}",
279-
"branch": "${{ github.ref }}".split('/').reverse()[0]
279+
"branch": "${{ github.ref_name }}"
280280
}
281281
env:
282282
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ jobs:
8585
PRECHECK_BUNDLED_GEMS: "no"
8686
if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
8787
continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
88-
- uses: k0kubun/action-slack@v2.0.0
88+
- uses: ruby/action-slack@v3.0.0
8989
with:
9090
payload: |
9191
{
9292
"ci": "GitHub Actions",
9393
"env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
9494
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
9595
"commit": "${{ github.sha }}",
96-
"branch": "${{ github.ref }}".split('/').reverse()[0]
96+
"branch": "${{ github.ref_name }}"
9797
}
9898
env:
9999
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/mingw.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
MSYSTEM: ${{ matrix.msystem }}
3333
MSYS2_ARCH: x86_64
3434
CHOST: "x86_64-w64-mingw32"
35-
CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe -fstack-protector-strong"
35+
CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
3636
CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
3737
CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
38-
LDFLAGS: "-pipe -fstack-protector-strong"
38+
LDFLAGS: "-pipe"
3939
UPDATE_UNICODE: "UNICODE_FILES=. UNICODE_PROPERTY_FILES=. UNICODE_AUXILIARY_FILES=. UNICODE_EMOJI_FILES=."
4040
GITPULLOPTIONS: --no-tags origin ${{github.ref}}
4141
strategy:
@@ -151,15 +151,15 @@ jobs:
151151
make ${{ StartsWith(matrix.test_task, 'spec/') && matrix.test_task || 'test-spec' }}
152152
if: ${{matrix.test_task == 'check' || matrix.test_task == 'test-spec' || StartsWith(matrix.test_task, 'spec/')}}
153153

154-
- uses: k0kubun/action-slack@v2.0.0
154+
- uses: ruby/action-slack@v3.0.0
155155
with:
156156
payload: |
157157
{
158158
"ci": "GitHub Actions",
159159
"env": "${{ github.workflow }} ${{ matrix.msystem }} / ${{ matrix.test_task }}",
160160
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
161161
"commit": "${{ github.sha }}",
162-
"branch": "${{ github.ref }}".split('/').reverse()[0]
162+
"branch": "${{ github.ref_name }}"
163163
}
164164
env:
165165
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/mjit-bindgen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ jobs:
8383
- run: $SETARCH make ${{ matrix.task }}
8484
- run: git diff --exit-code
8585
working-directory: src
86-
- uses: k0kubun/action-slack@v2.0.0
86+
- uses: ruby/action-slack@v3.0.0
8787
with:
8888
payload: |
8989
{
9090
"ci": "GitHub Actions",
9191
"env": "${{ matrix.os }} / ${{ matrix.test_task }}${{ matrix.configure }}",
9292
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
9393
"commit": "${{ github.sha }}",
94-
"branch": "${{ github.ref }}".split('/').reverse()[0]
94+
"branch": "${{ github.ref_name }}"
9595
}
9696
env:
9797
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/mjit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ jobs:
8484
ulimit -c unlimited
8585
make -s test-spec RUN_OPTS="$RUN_OPTS"
8686
timeout-minutes: 60
87-
- uses: k0kubun/action-slack@v2.0.0
87+
- uses: ruby/action-slack@v3.0.0
8888
with:
8989
payload: |
9090
{
9191
"ci": "GitHub Actions",
9292
"env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.jit_opts }}",
9393
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
9494
"commit": "${{ github.sha }}",
95-
"branch": "${{ github.ref }}".split('/').reverse()[0]
95+
"branch": "${{ github.ref_name }}"
9696
}
9797
env:
9898
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/spec_guards.yml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,13 @@ name: Rubyspec Version Guards Check
22

33
on:
44
push:
5-
paths-ignore:
6-
- 'doc/**'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '**.[1-8]'
11-
- '**.ronn'
5+
paths:
6+
- 'spec/**'
7+
- '!spec/*.md'
128
pull_request:
139
paths-ignore:
14-
- 'doc/**'
15-
- '**.md'
16-
- '**.rdoc'
17-
- '**/.document'
18-
- '**.[1-8]'
19-
- '**.ronn'
10+
- 'spec/**'
11+
- '!spec/*.md'
2012

2113
concurrency:
2214
group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
@@ -46,15 +38,15 @@ jobs:
4638
working-directory: spec/ruby
4739
env:
4840
CHECK_LEAKS: true
49-
- uses: k0kubun/action-slack@v2.0.0
41+
- uses: ruby/action-slack@v3.0.0
5042
with:
5143
payload: |
5244
{
5345
"ci": "GitHub Actions",
5446
"env": "${{ github.workflow }} / rubyspec @ ${{ matrix.ruby }}",
5547
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
5648
"commit": "${{ github.sha }}",
57-
"branch": "${{ github.ref }}".split('/').reverse()[0]
49+
"branch": "${{ github.ref_name }}"
5850
}
5951
env:
6052
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,15 @@ jobs:
120120
TESTS: ${{ matrix.skipped_tests }}
121121
if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }}
122122
continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
123-
- uses: k0kubun/action-slack@v2.0.0
123+
- uses: ruby/action-slack@v3.0.0
124124
with:
125125
payload: |
126126
{
127127
"ci": "GitHub Actions",
128128
"env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}${{ matrix.arch }}",
129129
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
130130
"commit": "${{ github.sha }}",
131-
"branch": "${{ github.ref }}".split('/').reverse()[0]
131+
"branch": "${{ github.ref_name }}"
132132
}
133133
env:
134134
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,15 @@ jobs:
138138
env:
139139
RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --job-status=normal
140140
timeout-minutes: 60
141-
- uses: k0kubun/action-slack@v2.0.0
141+
- uses: ruby/action-slack@v3.0.0
142142
with:
143143
payload: |
144144
{
145145
"ci": "GitHub Actions",
146146
"env": "VS${{ matrix.vs }} / ${{ matrix.test_task || 'check' }}",
147147
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
148148
"commit": "${{ github.sha }}",
149-
"branch": "${{ github.ref }}".split('/').reverse()[0]
149+
"branch": "${{ github.ref_name }}"
150150
}
151151
env:
152152
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

‎.github/workflows/yjit-ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- test_task: "check"
5858
configure: "--enable-yjit=dev"
59-
yjit_opts: "--yjit-call-threshold=1"
59+
yjit_opts: "--yjit-call-threshold=1 --yjit-verify-ctx"
6060

6161
- test_task: "test-all TESTS=--repeat-count=2"
6262
configure: "--enable-yjit=dev"
@@ -135,15 +135,15 @@ jobs:
135135
BASE_REPO: ${{ github.event.pull_request.base.repo.full_name }}
136136
BASE_SHA: ${{ github.event.pull_request.base.sha }}
137137
if: ${{ matrix.test_task == 'yjit-bench' && startsWith(github.event_name, 'pull') }}
138-
- uses: k0kubun/action-slack@v2.0.0
138+
- uses: ruby/action-slack@v3.0.0
139139
with:
140140
payload: |
141141
{
142142
"ci": "GitHub Actions",
143143
"env": "${{ github.workflow }} / ${{ matrix.test_task }} ${{ matrix.configure }}",
144144
"url": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
145145
"commit": "${{ github.sha }}",
146-
"branch": "${{ github.ref }}".split('/').reverse()[0]
146+
"branch": "${{ github.ref_name }}"
147147
}
148148
env:
149149
SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot

0 commit comments

Comments
 (0)