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

ruby-changes:68090

From: Jun <ko1@a...>
Date: Thu, 23 Sep 2021 17:21:24 +0900 (JST)
Subject: [ruby-changes:68090] e6118c8108 (master): .github/workflows/compilers.yml: Use `GNUMAKEFLAGS`.

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

From e6118c8108b6233615618ba1d048336ef83c6ff6 Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@r...>
Date: Wed, 22 Sep 2021 09:51:53 +0200
Subject: .github/workflows/compilers.yml: Use `GNUMAKEFLAGS`.

Because the `make` environment variable causes some rubygems tests to fail.
And to align with `.cirrus.yml`.
---
 .github/workflows/compilers.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index 2fc387a..6ddfba0 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -181,7 +181,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L181
       - name: setenv
         run: |
           echo "${{ matrix.entry.key }}=${{ matrix.entry.value }}" >> $GITHUB_ENV
-          echo "make=make -sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
+          echo "GNUMAKEFLAGS=-sj$((1 + $(nproc --all)))" >> $GITHUB_ENV
       - uses: actions/checkout@v2
         with:
           path: src
@@ -192,20 +192,20 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L192
           ../src/configure -C ${default_configure} ${append_configure}
           ${{ matrix.entry.key == 'crosshost' && '--host="${crosshost}"' || '--with-gcc="${default_cc} ${append_cc}"' }}
           ${{ matrix.entry.shared || '--enable-shared' }}
-      - run: $make extract-extlibs
-      - run: $make incs
-      - run: $make
-      - run: $make leaked-globals
-      - run: $make test
-      - run: $make install
+      - run: make extract-extlibs
+      - run: make incs
+      - run: make
+      - run: make leaked-globals
+      - run: make test
+      - run: make install
         if: ${{ matrix.entry.check }}
       - run: /usr/local/bin/gem install --no-doc timezone tzinfo
         if: ${{ matrix.entry.check }}
-      - run: $make test-tool
+      - run: make test-tool
         if: ${{ matrix.entry.check }}
-      - run: $make test-all TESTS='-- ruby -ext-'
+      - run: make test-all TESTS='-- ruby -ext-'
         if: ${{ matrix.entry.check }}
-      - run: $make test-spec
+      - run: make test-spec
         if: ${{ matrix.entry.check }}
 
       - uses: k0kubun/action-slack@v...
-- 
cgit v1.1


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

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