[前][次][番号順一覧][スレッド一覧]

ruby-changes:69630

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Nov 2021 22:37:25 +0900 (JST)
Subject: [ruby-changes:69630] 5ebda74ae1 (master): [MinGW] Pass -j option via environment variables

https://git.ruby-lang.org/ruby.git/commit/?id=5ebda74ae1

From 5ebda74ae10e6a9da6833424c5e138ad7f5063af Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 7 Nov 2021 15:50:25 +0900
Subject: [MinGW] Pass -j option via environment variables

---
 .github/workflows/mingw.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 417434bba28..0df79494599 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -60,7 +60,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L60
         run: |
           $build_jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
           $test_jobs = [int](1.5 * $env:NUMBER_OF_PROCESSORS)
-          Write-Output "BUILD_JOBS=$build_jobs" >> $env:GITHUB_ENV
+          Write-Output "GNUMAKEFLAGS=-j$build_jobs" >> $env:GITHUB_ENV
           Write-Output "TEST_JOBS=$test_jobs" >> $env:GITHUB_ENV
       - name: where check
         run: |
@@ -89,16 +89,16 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L89
 
       - name: update
         run: |
-          make -j $env:BUILD_JOBS incs
+          make incs
 
       - name: download gems
         run: |
-          make -j $env:BUILD_JOBS update-gems
+          make update-gems
 
       - name: make all
         timeout-minutes: 20
         run: |
-          make -j $env:BUILD_JOBS
+          make
 
       - run: make leaked-globals
 
@@ -116,8 +116,9 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L116
         run: |
           # Actions uses UTF8, causes test failures, similar to normal OS setup
           chcp.com 437
-          make test-all TESTOPTS="-j $env:TEST_JOBS --retry --job-status=normal --show-skip --timeout-scale=1.5"
+          make test-all
         env:
+          RUBY_TESTOPTS: -j${{env.TEST_JOBS}} --retry --job-status=normal --show-skip --timeout-scale=1.5
           BUNDLER_VERSION:
 
       - name: test-spec
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]