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

ruby-changes:69634

From: Nobuyoshi <ko1@a...>
Date: Sun, 7 Nov 2021 22:37:26 +0900 (JST)
Subject: [ruby-changes:69634] 7068255b0c (master): [MinGW] Run in sh

https://git.ruby-lang.org/ruby.git/commit/?id=7068255b0c

From 7068255b0cc796cf39f2939873ccfcb971e79d0c Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 7 Nov 2021 15:57:14 +0900
Subject: [MinGW] Run in sh

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

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
index 866b8529163..35748f27b1f 100644
--- a/.github/workflows/mingw.yml
+++ b/.github/workflows/mingw.yml
@@ -58,34 +58,28 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L58
           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 "GNUMAKEFLAGS=-j$build_jobs" >> $env:GITHUB_ENV
-          Write-Output "TEST_JOBS=$test_jobs" >> $env:GITHUB_ENV
+          echo "GNUMAKEFLAGS=-j$((2 * NUMBER_OF_PROCESSORS))" >> $GITHUB_ENV
+          echo "TEST_JOBS=$((15 * NUMBER_OF_PROCESSORS / 10))" >> $GITHUB_ENV
+
       - name: where check
         run: |
           # show where
-          Write-Host
-          $where = 'gcc.exe', 'ragel.exe', 'make.exe', 'bison.exe', 'libcrypto-1_1-x64.dll', 'libssl-1_1-x64.dll'
-          foreach ($e in $where) {
-            $rslt = where.exe $e 2>&1 | Out-String
-            if ($rslt.contains($e)) { Write-Host $rslt }
-            else { Write-Host "`nCan't find $e" }
-          }
+          result=true
+          for e in gcc.exe ragel.exe make.exe bison.exe libcrypto-1_1-x64.dll libssl-1_1-x64.dll; do
+            echo
+            where $e || result=false
+          done
+          $result
 
       - name: autogen
         run: |
           ./autogen.sh
         working-directory: src
-        shell: sh
 
       - name: configure
-        run: |
-          $config_args = "--build=$env:CHOST --host=$env:CHOST --target=$env:CHOST"
-          Write-Host $config_args
-          sh -c "../src/configure --disable-install-doc --prefix=/. $config_args"
-          # Write-Host "-------------------------------------- config.log"
-          # Get-Content ./config.log | foreach {Write-Output $_}
+        run: >
+          ../src/configure --disable-install-doc --prefix=/.
+          --build=$CHOST --host=$CHOST --target=$CHOST
 
       - name: update
         run: |
@@ -143,3 +137,4 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/mingw.yml#L137
 defaults:
   run:
     working-directory: build
+    shell: sh
-- 
cgit v1.2.1


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

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