diff options
author | 卜部昌平 <shyouhei@ruby-lang.org> | 2023-07-03 16:36:41 +0900 |
---|---|---|
committer | 卜部昌平 <shyouhei@ruby-lang.org> | 2023-07-04 20:13:49 +0900 |
commit | d1efc7a3f0430768817c04845f2a1f128d260da2 (patch) | |
tree | 8c7efa06a166295242d9f4fec72363125ef51f42 /.github | |
parent | 420d069cc2b9abcc1c7cc6a5d3cd6731bac4f54c (diff) | |
download | ruby-d1efc7a3f0430768817c04845f2a1f128d260da2.tar.gz |
chore: prettier [ci skip]
This is just `prettier --single-quote`. Single quote is because
it generated smaller diff than vice verca.
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/annocheck.yml | 2 | ||||
-rw-r--r-- | .github/workflows/bundled_gems.yml | 14 | ||||
-rw-r--r-- | .github/workflows/check_misc.yml | 2 | ||||
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 102 | ||||
-rw-r--r-- | .github/workflows/macos.yml | 14 | ||||
-rw-r--r-- | .github/workflows/mingw.yml | 20 | ||||
-rw-r--r-- | .github/workflows/rjit.yml | 10 | ||||
-rw-r--r-- | .github/workflows/scorecards.yml | 6 | ||||
-rw-r--r-- | .github/workflows/ubuntu.yml | 10 | ||||
-rw-r--r-- | .github/workflows/wasm.yml | 14 | ||||
-rw-r--r-- | .github/workflows/yjit-ubuntu.yml | 42 |
11 files changed, 118 insertions, 118 deletions
diff --git a/.github/workflows/annocheck.yml b/.github/workflows/annocheck.yml index 811f676ecc..1127a121ca 100644 --- a/.github/workflows/annocheck.yml +++ b/.github/workflows/annocheck.yml @@ -81,7 +81,7 @@ jobs: # FIXME: Drop skipping options # https://bugs.ruby-lang.org/issues/18061 # https://sourceware.org/annobin/annobin.html/Test-pie.html - TEST_ANNOCHECK_OPTS: "--skip-pie --skip-gaps" + TEST_ANNOCHECK_OPTS: '--skip-pie --skip-gaps' check: true name: ${{ matrix.entry.name }} diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml index a39adaf354..38bad88926 100644 --- a/.github/workflows/bundled_gems.yml +++ b/.github/workflows/bundled_gems.yml @@ -2,17 +2,17 @@ name: bundled_gems on: push: - branches: [ "master" ] + branches: ['master'] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' pull_request: - branches: [ "master" ] + branches: ['master'] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' merge_group: - branches: [ "master" ] + branches: ['master'] paths: - '.github/workflows/bundled_gems.yml' - 'gems/bundled_gems' @@ -20,13 +20,13 @@ on: - cron: '45 6 * * *' workflow_dispatch: -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: update: permissions: - contents: write # for Git to git push + contents: write # for Git to git push if: ${{ github.event_name != 'schedule' || github.repository == 'ruby/ruby' }} name: update ${{ github.workflow }} runs-on: ubuntu-latest @@ -83,8 +83,8 @@ jobs: git add -- gems/bundled_gems timeout-minutes: 30 env: - RUBY_TESTOPTS: "-q --tty=no" - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" + RUBY_TESTOPTS: '-q --tty=no' + TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' if: ${{ steps.diff.outcome == 'failure' }} - name: Show diffs diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml index ab0b4f0008..f7dd6e3c8d 100644 --- a/.github/workflows/check_misc.yml +++ b/.github/workflows/check_misc.yml @@ -11,7 +11,7 @@ permissions: jobs: checks: permissions: - contents: write # for Git to git push + contents: write # for Git to git push runs-on: ubuntu-latest steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 282b8b6987..f2db992353 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -1,8 +1,8 @@ -name: "CodeQL" +name: 'CodeQL' on: push: - branches: [ "master" ] + branches: ['master'] paths-ignore: - 'doc/**' - '**/man' @@ -24,7 +24,7 @@ concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }} -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: @@ -32,9 +32,9 @@ jobs: name: Analyze runs-on: ubuntu-latest permissions: - actions: read # for github/codeql-action/init to get workflow details - contents: read # for actions/checkout to fetch code - security-events: write # for github/codeql-action/autobuild to send a status report + actions: read # for github/codeql-action/init to get workflow details + contents: read # for actions/checkout to fetch code + security-events: write # for github/codeql-action/autobuild to send a status report # CodeQL fails to run pull requests from dependabot due to missing write access to upload results. if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') && github.event.head_commit.pusher.name != 'dependabot[bot]' }} @@ -44,58 +44,58 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'cpp', 'ruby' ] + language: ['cpp', 'ruby'] steps: - - name: Checkout repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 + - name: Checkout repository + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 - - name: Install libraries - uses: ./.github/actions/setup/ubuntu + - name: Install libraries + uses: ./.github/actions/setup/ubuntu - - uses: ./.github/actions/setup/directories + - uses: ./.github/actions/setup/directories - - name: Remove an obsolete rubygems vendored file - run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb + - name: Remove an obsolete rubygems vendored file + run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb - - name: Initialize CodeQL - uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - languages: ${{ matrix.language }} + - name: Initialize CodeQL + uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 + with: + languages: ${{ matrix.language }} - - name: Autobuild - uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 + - name: Autobuild + uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - category: "/language:${{matrix.language}}" - upload: False - output: sarif-results + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 + with: + category: '/language:${{matrix.language}}' + upload: False + output: sarif-results - - name: filter-sarif - uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0 - with: - patterns: | - +**/*.rb - -lib/uri/mailto.rb:rb/overly-large-range - -lib/uri/rfc3986_parser.rb:rb/overly-large-range - -lib/bundler/vendor/uri/lib/uri/mailto.rb:rb/overly-large-range - -lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb:rb/overly-large-range - -test/ruby/test_io.rb:rb/non-constant-kernel-open - -test/open-uri/test_open-uri.rb:rb/non-constant-kernel-open - -test/open-uri/test_ssl.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/binread_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/readlines_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/foreach_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/write_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/io/read_spec.rb:rb/non-constant-kernel-open - -spec/ruby/core/kernel/open_spec.rb:rb/non-constant-kernel-open - input: sarif-results/${{ matrix.language }}.sarif - output: sarif-results/${{ matrix.language }}.sarif - if: ${{ matrix.language == 'ruby' }} + - name: filter-sarif + uses: advanced-security/filter-sarif@f3b8118a9349d88f7b1c0c488476411145b6270d # v1.0 + with: + patterns: | + +**/*.rb + -lib/uri/mailto.rb:rb/overly-large-range + -lib/uri/rfc3986_parser.rb:rb/overly-large-range + -lib/bundler/vendor/uri/lib/uri/mailto.rb:rb/overly-large-range + -lib/bundler/vendor/uri/lib/uri/rfc3986_parser.rb:rb/overly-large-range + -test/ruby/test_io.rb:rb/non-constant-kernel-open + -test/open-uri/test_open-uri.rb:rb/non-constant-kernel-open + -test/open-uri/test_ssl.rb:rb/non-constant-kernel-open + -spec/ruby/core/io/binread_spec.rb:rb/non-constant-kernel-open + -spec/ruby/core/io/readlines_spec.rb:rb/non-constant-kernel-open + -spec/ruby/core/io/foreach_spec.rb:rb/non-constant-kernel-open + -spec/ruby/core/io/write_spec.rb:rb/non-constant-kernel-open + -spec/ruby/core/io/read_spec.rb:rb/non-constant-kernel-open + -spec/ruby/core/kernel/open_spec.rb:rb/non-constant-kernel-open + input: sarif-results/${{ matrix.language }}.sarif + output: sarif-results/${{ matrix.language }}.sarif + if: ${{ matrix.language == 'ruby' }} - - name: Upload SARIF - uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 - with: - sarif_file: sarif-results/${{ matrix.language }}.sarif + - name: Upload SARIF + uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.13.4 + with: + sarif_file: sarif-results/${{ matrix.language }}.sarif diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2be750e853..821b36cd9e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -33,7 +33,7 @@ jobs: make: strategy: matrix: - test_task: ["check"] # "test-bundler-parallel", "test-bundled-gems" + test_task: ['check'] # "test-bundler-parallel", "test-bundled-gems" os: - macos-11 - macos-12 @@ -70,18 +70,18 @@ jobs: make -s ${{ matrix.test_task }} ${TESTS:+TESTS=`echo "$TESTS" | sed 's| |$$/ -n!/|g;s|^|-n!/|;s|$|$$/|'`} timeout-minutes: 40 env: - RUBY_TESTOPTS: "-q --tty=no" + RUBY_TESTOPTS: '-q --tty=no' TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" - PRECHECK_BUNDLED_GEMS: "no" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' + PRECHECK_BUNDLED_GEMS: 'no' - name: make skipped tests run: | make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'` env: - GNUMAKEFLAGS: "" - RUBY_TESTOPTS: "-v --tty=no" + GNUMAKEFLAGS: '' + RUBY_TESTOPTS: '-v --tty=no' TESTS: ${{ matrix.skipped_tests }} - PRECHECK_BUNDLED_GEMS: "no" + PRECHECK_BUNDLED_GEMS: 'no' if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }} continue-on-error: ${{ matrix.continue-on-skipped_tests || false }} - uses: ./.github/actions/slack diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 3d3ede56a1..27200e49d0 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -39,20 +39,20 @@ jobs: env: MSYSTEM: ${{ matrix.msystem }} MSYS2_ARCH: x86_64 - CHOST: "x86_64-w64-mingw32" - CFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" - CXXFLAGS: "-march=x86-64 -mtune=generic -O3 -pipe" - CPPFLAGS: "-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048" - LDFLAGS: "-pipe" + CHOST: 'x86_64-w64-mingw32' + CFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe' + CXXFLAGS: '-march=x86-64 -mtune=generic -O3 -pipe' + CPPFLAGS: '-D_FORTIFY_SOURCE=2 -D__USE_MINGW_ANSI_STDIO=1 -DFD_SETSIZE=2048' + LDFLAGS: '-pipe' GITPULLOPTIONS: --no-tags origin ${{github.ref}} strategy: matrix: include: # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses. - - msystem: "UCRT64" + - msystem: 'UCRT64' base_ruby: head - test_task: "check" - test-all-opts: "--name=!/TestObjSpace#test_reachable_objects_during_iteration/" + test_task: 'check' + test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/' fail-fast: false if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }} steps: @@ -115,8 +115,8 @@ jobs: timeout-minutes: 30 run: make test env: - GNUMAKEFLAGS: "" - RUBY_TESTOPTS: "-v --tty=no" + GNUMAKEFLAGS: '' + RUBY_TESTOPTS: '-v --tty=no' if: ${{matrix.test_task == 'check' || matrix.test_task == 'test'}} - name: test-all diff --git a/.github/workflows/rjit.yml b/.github/workflows/rjit.yml index 65e0791b19..85708d6b45 100644 --- a/.github/workflows/rjit.yml +++ b/.github/workflows/rjit.yml @@ -70,23 +70,23 @@ jobs: $SETARCH make -s test RUN_OPTS="$RUN_OPTS" timeout-minutes: 30 env: - GNUMAKEFLAGS: "" - RUBY_TESTOPTS: "-v --tty=no" + GNUMAKEFLAGS: '' + RUBY_TESTOPTS: '-v --tty=no' RUN_OPTS: ${{ matrix.run_opts }} - name: make test-all run: | $SETARCH make -s test-all RUN_OPTS="$RUN_OPTS" timeout-minutes: 40 env: - GNUMAKEFLAGS: "" - RUBY_TESTOPTS: "-v --tty=no" + GNUMAKEFLAGS: '' + RUBY_TESTOPTS: '-v --tty=no' RUN_OPTS: ${{ matrix.run_opts }} - name: make test-spec run: | $SETARCH make -s test-spec RUN_OPTS="$RUN_OPTS" timeout-minutes: 10 env: - GNUMAKEFLAGS: "" + GNUMAKEFLAGS: '' RUN_OPTS: ${{ matrix.run_opts }} - uses: ./.github/actions/slack with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 850764aa02..5c480eed46 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -31,12 +31,12 @@ jobs: # actions: read steps: - - name: "Checkout code" + - name: 'Checkout code' uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 with: persist-credentials: false - - name: "Run analysis" + - name: 'Run analysis' uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0 with: results_file: results.sarif @@ -66,7 +66,7 @@ jobs: # retention-days: 5 # Upload the results to GitHub's code scanning dashboard. - - name: "Upload to code-scanning" + - name: 'Upload to code-scanning' uses: github/codeql-action/upload-sarif@cdcdbb579706841c47f7063dda365e292e5cad7a # v2.1.27 with: sarif_file: results.sarif diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0f6dc3942f..b66c33f59a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -87,16 +87,16 @@ jobs: ${{ contains(matrix.test_task, 'bundle') && '' || 'RUBYOPT=-w' }} timeout-minutes: 40 env: - RUBY_TESTOPTS: "-q --tty=no" + RUBY_TESTOPTS: '-q --tty=no' TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" - PRECHECK_BUNDLED_GEMS: "no" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' + PRECHECK_BUNDLED_GEMS: 'no' - name: make skipped tests run: | $SETARCH make -s test-all TESTS=`echo "$TESTS" | sed 's| |$$/ -n/|g;s|^|-n/|;s|$|$$/|'` env: - GNUMAKEFLAGS: "" - RUBY_TESTOPTS: "-v --tty=no" + GNUMAKEFLAGS: '' + RUBY_TESTOPTS: '-v --tty=no' TESTS: ${{ matrix.skipped_tests }} if: ${{ matrix.test_task == 'check' && matrix.skipped_tests != '' }} continue-on-error: ${{ matrix.continue-on-skipped_tests || false }} diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml index cd62957217..8fcb564bff 100644 --- a/.github/workflows/wasm.yml +++ b/.github/workflows/wasm.yml @@ -26,7 +26,7 @@ concurrency: group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }} cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }} -permissions: # added using https://github.com/step-security/secure-workflows +permissions: # added using https://github.com/step-security/secure-workflows contents: read jobs: @@ -35,13 +35,13 @@ jobs: matrix: entry: # # wasmtime can't compile non-optimized Asyncified binary due to locals explosion -# - { name: O0-debuginfo, optflags: "-O0", debugflags: "-g", wasmoptflags: "-O1" } -# - { name: O1, optflags: "-O1", debugflags: "" , wasmoptflags: "-O1" } - - { name: O2, optflags: "-O2", debugflags: "" , wasmoptflags: "-O2" } -# - { name: O3, optflags: "-O3", debugflags: "" , wasmoptflags: "-O3" } +# - { name: O0-debuginfo, optflags: '-O0', debugflags: '-g', wasmoptflags: '-O1' } +# - { name: O1, optflags: '-O1', debugflags: '' , wasmoptflags: '-O1' } + - { name: O2, optflags: '-O2', debugflags: '', wasmoptflags: '-O2' } +# - { name: O3, optflags: '-O3', debugflags: '' , wasmoptflags: '-O3' } # # -O4 is equivalent to -O3 in clang, but it's different in wasm-opt -# - { name: O4, optflags: "-O3", debugflags: "" , wasmoptflags: "-O4" } -# - { name: Oz, optflags: "-Oz", debugflags: "" , wasmoptflags: "-Oz" } +# - { name: O4, optflags: '-O3', debugflags: '' , wasmoptflags: '-O4' } +# - { name: Oz, optflags: '-Oz', debugflags: '' , wasmoptflags: '-Oz' } fail-fast: false env: RUBY_TESTOPTS: '-q --tty=no' diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml index 6b20a5058d..dd31c95127 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -61,32 +61,32 @@ jobs: fail-fast: false matrix: include: - - test_task: "yjit-bindgen" - hint: "To fix: use patch in logs" - configure: "--with-gcc=clang-12 --enable-yjit=dev" + - test_task: 'yjit-bindgen' + hint: 'To fix: use patch in logs' + configure: '--with-gcc=clang-12 --enable-yjit=dev' - - test_task: "check" + - test_task: 'check' # YJIT should be automatically built in release mode on x86-64 Linux with rustc present #configure: "--enable-yjit RUSTC='rustc +1.58.0'" configure: "RUSTC='rustc +1.58.0'" - rust_version: "1.58.0" + rust_version: '1.58.0' - - test_task: "check" - configure: "--enable-yjit=dev" + - test_task: 'check' + configure: '--enable-yjit=dev' - - test_task: "check" - configure: "--enable-yjit=dev" - yjit_opts: "--yjit-call-threshold=1 --yjit-verify-ctx" + - test_task: 'check' + configure: '--enable-yjit=dev' + yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx' - - test_task: "test-all TESTS=--repeat-count=2" - configure: "--enable-yjit=dev" + - test_task: 'test-all TESTS=--repeat-count=2' + configure: '--enable-yjit=dev' - - test_task: "test-bundled-gems" - configure: "--enable-yjit=dev" + - test_task: 'test-bundled-gems' + configure: '--enable-yjit=dev' - - test_task: "yjit-bench" - configure: "--enable-yjit=dev" - yjit_bench_opts: "--yjit-stats" + - test_task: 'yjit-bench' + configure: '--enable-yjit=dev' + yjit_bench_opts: '--yjit-stats' env: GITPULLOPTIONS: --no-tags origin ${{github.ref}} RUN_OPTS: ${{ matrix.yjit_opts }} @@ -129,10 +129,10 @@ jobs: run: make -s -j ${{ matrix.test_task }} RUN_OPTS="$RUN_OPTS" YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" timeout-minutes: 60 env: - RUBY_TESTOPTS: "-q --tty=no" - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" - PRECHECK_BUNDLED_GEMS: "no" - SYNTAX_SUGGEST_TIMEOUT: "5" + RUBY_TESTOPTS: '-q --tty=no' + TEST_BUNDLED_GEMS_ALLOW_FAILURES: '' + PRECHECK_BUNDLED_GEMS: 'no' + SYNTAX_SUGGEST_TIMEOUT: '5' continue-on-error: ${{ matrix.test_task == 'yjit-bench' }} - name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison run: echo "https://github.com/${BASE_REPO}/commit/${BASE_SHA}" |