Skip to content

Commit c095083

Browse files
committed
fix
1 parent 9ecf27d commit c095083

8 files changed

Lines changed: 144 additions & 130 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ inputs:
1919
description: >-
2020
Launchable token is needed if you want to run Launchable on your forked repository.
2121
See https://github.com/ruby/ruby/wiki/CI-Servers#launchable-ci for details.
22+
23+
launchable-url:
24+
required: false
25+
description: >-
26+
Launchable token is needed if you want to run Launchable on your forked repository.
27+
See https://github.com/ruby/ruby/wiki/CI-Servers#launchable-ci for details.
2228
2329
builddir:
2430
required: false
@@ -107,6 +113,7 @@ runs:
107113
: # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71
108114
echo "GITHUB_PR_HEAD_SHA=${{ github.event.pull_request.head.sha || github.sha }}" >> $GITHUB_ENV
109115
echo "LAUNCHABLE_TOKEN=${{ inputs.launchable-token }}" >> $GITHUB_ENV
116+
echo "LAUNCHABLE_BASE_URL=${{ inputs.launchable-url }}" >> $GITHUB_ENV
110117
if: steps.enable-launchable.outputs.enable-launchable
111118

112119
- name: Set up path

.github/workflows/macos.yml

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: macOS
22
on:
33
push:
44
paths-ignore:
5-
- 'doc/**'
6-
- '**/man/*'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '.*.yml'
5+
- "doc/**"
6+
- "**/man/*"
7+
- "**.md"
8+
- "**.rdoc"
9+
- "**/.document"
10+
- ".*.yml"
1111
pull_request:
1212
# Do not use paths-ignore for required status checks
1313
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
@@ -29,13 +29,13 @@ jobs:
2929
os: macos-14
3030
- test_task: check
3131
os: macos-14
32-
configure_args: '--with-gcc=gcc-14'
32+
configure_args: "--with-gcc=gcc-14"
3333
- test_task: check
3434
os: macos-14
35-
configure_args: '--with-jemalloc --with-opt-dir=$(brew --prefix jemalloc)'
35+
configure_args: "--with-jemalloc --with-opt-dir=$(brew --prefix jemalloc)"
3636
- test_task: check
3737
os: macos-14
38-
configure_args: '--with-gmp'
38+
configure_args: "--with-gmp"
3939
- test_task: test-all
4040
test_opts: --repeat-count=2
4141
os: macos-14
@@ -130,6 +130,7 @@ jobs:
130130
os: ${{ matrix.os }}
131131
test-opts: ${{ matrix.test_opts }}
132132
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
133+
launchable-url: ${{ secrets.LAUNCHABLE_BASE_URL }}
133134
builddir: build
134135
srcdir: src
135136
continue-on-error: true
@@ -146,17 +147,17 @@ jobs:
146147
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
147148
timeout-minutes: 60
148149
env:
149-
RUBY_TESTOPTS: '-q --tty=no'
150-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
151-
PRECHECK_BUNDLED_GEMS: 'no'
150+
RUBY_TESTOPTS: "-q --tty=no"
151+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: "typeprof"
152+
PRECHECK_BUNDLED_GEMS: "no"
152153

153154
- name: make skipped tests
154155
run: |
155156
make -s test-all TESTS="${TESTS//-n!\//-n/}"
156157
env:
157-
GNUMAKEFLAGS: ''
158-
RUBY_TESTOPTS: '-v --tty=no'
159-
PRECHECK_BUNDLED_GEMS: 'no'
158+
GNUMAKEFLAGS: ""
159+
RUBY_TESTOPTS: "-v --tty=no"
160+
PRECHECK_BUNDLED_GEMS: "no"
160161
if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
161162
continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
162163

.github/workflows/mingw.yml

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ name: MinGW
22
on:
33
push:
44
paths-ignore:
5-
- 'doc/**'
6-
- '**/man/*'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '.*.yml'
5+
- "doc/**"
6+
- "**/man/*"
7+
- "**.md"
8+
- "**.rdoc"
9+
- "**/.document"
10+
- ".*.yml"
1111
pull_request:
1212
paths-ignore:
13-
- 'doc/**'
14-
- '**/man/*'
15-
- '**.md'
16-
- '**.rdoc'
17-
- '**/.document'
18-
- '.*.yml'
13+
- "doc/**"
14+
- "**/man/*"
15+
- "**.md"
16+
- "**.rdoc"
17+
- "**/.document"
18+
- ".*.yml"
1919
merge_group:
2020

2121
concurrency:
@@ -37,22 +37,22 @@ jobs:
3737
env:
3838
MSYSTEM: ${{ matrix.msystem }}
3939
MSYS2_ARCH: x86_64
40-
CHOST: 'x86_64-w64-mingw32'
41-
CFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe'
42-
CXXFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe'
43-
CPPFLAGS: '-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048'
44-
LDFLAGS: '-pipe'
40+
CHOST: "x86_64-w64-mingw32"
41+
CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
42+
CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe"
43+
CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048"
44+
LDFLAGS: "-pipe"
4545
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
4646

4747
strategy:
4848
matrix:
4949
include:
5050
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
5151
# Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x
52-
- msystem: 'UCRT64'
53-
baseruby: '3.2'
54-
test_task: 'check'
55-
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
52+
- msystem: "UCRT64"
53+
baseruby: "3.2"
54+
test_task: "check"
55+
test-all-opts: "--name=!/TestObjSpace#test_reachable_objects_during_iteration/"
5656
fail-fast: false
5757

5858
if: >-
@@ -124,6 +124,7 @@ jobs:
124124
with:
125125
os: windows-2022
126126
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
127+
launchable-url: ${{ secrets.LAUNCHABLE_BASE_URL }}
127128
builddir: build
128129
srcdir: src
129130
test-tasks: '["test", "test-all"]'
@@ -134,8 +135,8 @@ jobs:
134135
run: make test
135136
shell: cmd
136137
env:
137-
GNUMAKEFLAGS: ''
138-
RUBY_TESTOPTS: '-v --tty=no'
138+
GNUMAKEFLAGS: ""
139+
RUBY_TESTOPTS: "-v --tty=no"
139140
if: ${{ matrix.test_task == 'check' || matrix.test_task == 'test' }}
140141

141142
- name: test-all

.github/workflows/rjit.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ name: RJIT
22
on:
33
push:
44
paths-ignore:
5-
- 'doc/**'
6-
- '**.md'
7-
- '**.rdoc'
8-
- '**/.document'
9-
- '**.[1-8]'
10-
- '**.ronn'
11-
- '.*.yml'
5+
- "doc/**"
6+
- "**.md"
7+
- "**.rdoc"
8+
- "**/.document"
9+
- "**.[1-8]"
10+
- "**.ronn"
11+
- ".*.yml"
1212
pull_request:
1313
paths-ignore:
14-
- 'doc/**'
15-
- '**.md'
16-
- '**.rdoc'
17-
- '**/.document'
18-
- '**.[1-8]'
19-
- '**.ronn'
20-
- '.*.yml'
14+
- "doc/**"
15+
- "**.md"
16+
- "**.rdoc"
17+
- "**/.document"
18+
- "**.[1-8]"
19+
- "**.ronn"
20+
- ".*.yml"
2121
merge_group:
2222

2323
concurrency:
@@ -33,8 +33,8 @@ jobs:
3333
matrix:
3434
# main variables included in the job name
3535
test_task: [check]
36-
run_opts: ['--rjit-call-threshold=1']
37-
arch: ['']
36+
run_opts: ["--rjit-call-threshold=1"]
37+
arch: [""]
3838
fail-fast: false
3939

4040
env:
@@ -84,6 +84,7 @@ jobs:
8484
with:
8585
os: ubuntu-22.04
8686
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
87+
launchable-url: ${{ secrets.LAUNCHABLE_BASE_URL }}
8788
builddir: build
8889
srcdir: src
8990
test-opts: ${{ matrix.run_opts }}
@@ -95,7 +96,7 @@ jobs:
9596
$SETARCH make -s test RUN_OPTS="$RUN_OPTS"
9697
timeout-minutes: 30
9798
env:
98-
GNUMAKEFLAGS: ''
99+
GNUMAKEFLAGS: ""
99100
RUBY_TESTOPTS: >-
100101
${{ env.TESTS }}
101102
--tty=no
@@ -106,16 +107,16 @@ jobs:
106107
$SETARCH make -s test-all RUN_OPTS="$RUN_OPTS"
107108
timeout-minutes: 60
108109
env:
109-
GNUMAKEFLAGS: ''
110-
RUBY_TESTOPTS: '-q --tty=no'
110+
GNUMAKEFLAGS: ""
111+
RUBY_TESTOPTS: "-q --tty=no"
111112
RUN_OPTS: ${{ matrix.run_opts }}
112113

113114
- name: make test-spec
114115
run: |
115116
$SETARCH make -s test-spec RUN_OPTS="$RUN_OPTS"
116117
timeout-minutes: 10
117118
env:
118-
GNUMAKEFLAGS: ''
119+
GNUMAKEFLAGS: ""
119120
RUN_OPTS: ${{ matrix.run_opts }}
120121

121122
- uses: ./.github/actions/slack

.github/workflows/ubuntu.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: Ubuntu
22
on:
33
push:
44
paths-ignore:
5-
- 'doc/**'
6-
- '**/man/*'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '.*.yml'
5+
- "doc/**"
6+
- "**/man/*"
7+
- "**.md"
8+
- "**.rdoc"
9+
- "**/.document"
10+
- ".*.yml"
1111
pull_request:
1212
# Do not use paths-ignore for required status checks
1313
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
@@ -26,16 +26,16 @@ jobs:
2626
matrix:
2727
include:
2828
- test_task: check
29-
configure: 'cppflags=-DVM_CHECK_MODE'
29+
configure: "cppflags=-DVM_CHECK_MODE"
3030
- test_task: check
3131
arch: i686
3232
- test_task: check
33-
configure: '--disable-yjit'
33+
configure: "--disable-yjit"
3434
- test_task: check
35-
configure: '--enable-shared --enable-load-relative'
35+
configure: "--enable-shared --enable-load-relative"
3636
- test_task: check
3737
modular_gc: true
38-
configure: '--with-modular-gc=/home/runner/ruby_gc'
38+
configure: "--with-modular-gc=/home/runner/ruby_gc"
3939
- test_task: test-bundler-parallel
4040
timeout: 50
4141
- test_task: test-bundled-gems
@@ -73,7 +73,7 @@ jobs:
7373

7474
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
7575
with:
76-
ruby-version: '3.0'
76+
ruby-version: "3.0"
7777
bundler: none
7878

7979
- uses: ./.github/actions/setup/directories
@@ -131,6 +131,7 @@ jobs:
131131
os: ${{ matrix.os || 'ubuntu-22.04' }}
132132
test-opts: ${{ matrix.configure }}
133133
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
134+
launchable-url: ${{ secrets.LAUNCHABLE_BASE_URL }}
134135
builddir: build
135136
srcdir: src
136137
continue-on-error: true
@@ -142,16 +143,16 @@ jobs:
142143
${{ !contains(matrix.test_task, 'bundle') && 'RUBYOPT=-w' || '' }}
143144
timeout-minutes: ${{ matrix.timeout || 40 }}
144145
env:
145-
RUBY_TESTOPTS: '-q --tty=no'
146-
TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof'
147-
PRECHECK_BUNDLED_GEMS: 'no'
146+
RUBY_TESTOPTS: "-q --tty=no"
147+
TEST_BUNDLED_GEMS_ALLOW_FAILURES: "typeprof"
148+
PRECHECK_BUNDLED_GEMS: "no"
148149

149150
- name: make skipped tests
150151
run: |
151152
$SETARCH make -s test-all TESTS="${TESTS//-n!\//-n/}"
152153
env:
153-
GNUMAKEFLAGS: ''
154-
RUBY_TESTOPTS: '-v --tty=no'
154+
GNUMAKEFLAGS: ""
155+
RUBY_TESTOPTS: "-v --tty=no"
155156
if: ${{ matrix.test_task == 'check' && matrix.skipped_tests }}
156157
continue-on-error: ${{ matrix.continue-on-skipped_tests || false }}
157158

.github/workflows/windows.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ name: Windows
22
on:
33
push:
44
paths-ignore:
5-
- 'doc/**'
6-
- '**/man/*'
7-
- '**.md'
8-
- '**.rdoc'
9-
- '**/.document'
10-
- '.*.yml'
5+
- "doc/**"
6+
- "**/man/*"
7+
- "**.md"
8+
- "**.rdoc"
9+
- "**/.document"
10+
- ".*.yml"
1111
pull_request:
1212
# Do not use paths-ignore for required status checks
1313
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
@@ -27,7 +27,7 @@ jobs:
2727
include:
2828
- vc: 2015
2929
vs: 2019
30-
vcvars: '10.0.14393.0 -vcvars_ver=14.0' # The oldest Windows 10 SDK w/ VC++ 2015 toolset (v140)
30+
vcvars: "10.0.14393.0 -vcvars_ver=14.0" # The oldest Windows 10 SDK w/ VC++ 2015 toolset (v140)
3131
test_task: check
3232
- vs: 2019
3333
test_task: check
@@ -90,7 +90,7 @@ jobs:
9090

9191
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
9292
with:
93-
ruby-version: '3.0'
93+
ruby-version: "3.0"
9494
bundler: none
9595
windows-toolchain: none
9696

@@ -179,6 +179,7 @@ jobs:
179179
with:
180180
os: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
181181
launchable-token: ${{ secrets.LAUNCHABLE_TOKEN }}
182+
launchable-url: ${{ secrets.LAUNCHABLE_BASE_URL }}
182183
builddir: build
183184
srcdir: src
184185
test-task: ${{ matrix.test_task || 'check' }}

0 commit comments

Comments
 (0)