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

ruby-changes:67129

From: Nobuyoshi <ko1@a...>
Date: Thu, 12 Aug 2021 14:09:47 +0900 (JST)
Subject: [ruby-changes:67129] 7ac440910c (master): Separate jobs conditions

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

From 7ac440910cb5825eb7ee57544318ffd479dac82b Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 12 Aug 2021 13:14:24 +0900
Subject: Separate jobs conditions

---
 .github/workflows/compilers.yml | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml
index af0be21..cc8c6b0 100644
--- a/.github/workflows/compilers.yml
+++ b/.github/workflows/compilers.yml
@@ -88,7 +88,7 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L88
           - { key: CXXFLAGS,  name: c++2a, value: '-std=c++2a -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' }
 
           - { key: optflags, name: '-O0', value: '-O0 -march=x86-64 -mtune=generic' }
-#         - { key: optflags, name: '-O3', value: '-O3 -march=x86-64 -mtune=generic' }
+#         - { key: optflags, name: '-O3', value: '-O3 -march=x86-64 -mtune=generic', check: true }
 
           - { key: append_configure, name: gmp,                  value: '--with-gmp' }
           - { key: append_configure, name: jemalloc,             value: '--with-jemalloc' }
@@ -172,33 +172,26 @@ jobs: https://github.com/ruby/ruby/blob/trunk/.github/workflows/compilers.yml#L172
       - run: ./autogen.sh
         working-directory: src
       - name: Run configure
-        run: |
-          if [ -n "${crosshost}" ]; then
-            ../src/configure -C \
-              ${default_configure} \
-              ${append_configure} \
-              --host="${crosshost}"
-          else
-            ../src/configure -C \
-              ${default_configure} \
-              ${append_configure} \
-              --with-gcc="${default_cc} ${append_cc}"
-          fi
+        run: ../src/configure -C ${default_configure} ${append_configure} --with-gcc="${default_cc} ${append_cc}"
+        if: ${{ matrix.entry.key != 'crosshost' }}
+      - name: Run cross configure
+        run: ../src/configure -C ${default_configure} ${append_configure} --host="${crosshost}"
+        if: ${{ matrix.entry.key == 'crosshost' }}
       - run: $make extract-extlibs
       - run: $make incs
       - run: $make
       - run: $make leaked-globals
       - run: $make test
       - run: $make install
-        if: ${{ matrix.entry.name == '-O3' }}
+        if: ${{ matrix.entry.check }}
       - run: /usr/local/bin/gem install --no-doc timezone tzinfo
-        if: ${{ matrix.entry.name == '-O3' }}
+        if: ${{ matrix.entry.check }}
       - run: $make test-tool
-        if: ${{ matrix.entry.name == '-O3' }}
+        if: ${{ matrix.entry.check }}
       - run: $make test-all TESTS='-- ruby -ext-'
-        if: ${{ matrix.entry.name == '-O3' }}
+        if: ${{ matrix.entry.check }}
       - run: $make test-spec
-        if: ${{ matrix.entry.name == '-O3' }}
+        if: ${{ matrix.entry.check }}
 
       - uses: k0kubun/action-slack@v...
         with:
-- 
cgit v1.1


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

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