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

ruby-changes:69627

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Nov 2021 22:37:20 +0900 (JST)
Subject: [ruby-changes:69627] 5eb54c495f (master): [MinGW] Set job env vars at once

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

From 5eb54c495ff78d2d5fbbdff71b56460654e597f6 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 8 Feb 2021 00:02:20 +0900
Subject: [MinGW] Set job env vars at once

---
 .github/workflows/mingw.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 27e8c3b9f04..d440c08c46a 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -56,6 +56,12 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L56
           setup-ruby-ref: MSP-Greg/ruby-setup-ruby/00-win-ucrt
           mingw: _upgrade_ gmp libffi libyaml openssl ragel readline gcc
           msys2: automake1.16 bison
+      - name: set env
+        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 "TEST_JOBS=$test_jobs" >> $env:GITHUB_ENV
       - name: where check
         run: |
           # show where
@@ -88,19 +94,16 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L94
 
       - name: update
         run: |
-          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
-          make -j $jobs incs
+          make -j $env:BUILD_JOBS incs
 
       - name: download gems
         run: |
-          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
-          make -j $jobs update-gems
+          make -j $env:BUILD_JOBS update-gems
 
       - name: make all
         timeout-minutes: 20
         run: |
-          $jobs = [int](2 * $env:NUMBER_OF_PROCESSORS)
-          make -j $jobs
+          make -j $env:BUILD_JOBS
 
       - run: make leaked-globals
 
@@ -124,9 +127,8 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L127
           $PSDefaultParameterValues['*:Encoding'] = 'utf8'
           [Console]::OutputEncoding = [System.Text.Encoding]::GetEncoding("IBM437")
           [Console]::InputEncoding  = [System.Text.Encoding]::GetEncoding("IBM437")
-          $jobs = [int](1.5 * $env:NUMBER_OF_PROCESSORS)
           if ($env:BUNDLER_VERSION) { Remove-Item env:\BUNDLER_VERSION }
-          make test-all TESTOPTS="-j $jobs --retry --job-status=normal --show-skip --timeout-scale=1.5"
+          make test-all TESTOPTS="-j $env:TEST_JOBS --retry --job-status=normal --show-skip --timeout-scale=1.5"
 
       - name: test-spec
         timeout-minutes: 10
-- 
cgit v1.2.1


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

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