From 905d4010bf250f5ba793c911ff65f12a2eda2fb3 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Sat, 8 Aug 2020 19:20:49 +0900
Subject: Fix wrong YAML in `.github/workflows/build.yml`.

---
 .github/workflows/build.yml | 48 ++++++++++++---------------------------------
 1 file changed, 13 insertions(+), 35 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b04da6b64..95f7c40d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,15 +11,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: apt
       run: sudo apt install ruby gperf
-    - name: build
-      run: rake -m
-    - name: test
-      run: rake test
-      run: sudo apt install ruby gperf
     - name: build and test
       run: rake -m -j4 gensym all test
-      env:
-        MRUBY_TARGET: travis
 
   Ubuntu-1804-gcc:
     runs-on: ubuntu-18.04
@@ -33,10 +26,6 @@ jobs:
       run: sudo apt install ruby gperf gcc g++
     - name: build and test
       run: rake -m -j4 gensym all test
-      env:
-        MRUBY_TARGET: travis
-        CC: gcc
-        CXX: g++
 
   Ubuntu-1804-clang:
     runs-on: ubuntu-18.04
@@ -50,10 +39,6 @@ jobs:
       run: sudo apt install ruby gperf
     - name: build and test
       run: rake -m -j4 gensym all test
-      env:
-        MRUBY_TARGET: travis
-        CC: clang
-        CXX: clang++
 
   macOS:
     runs-on: macos-latest
@@ -65,23 +50,23 @@ jobs:
       run: brew install ruby gperf
     - name: build and test
       run: rake -m -j4 gensym all test
-      env:
-        MRUBY_TARGET: travis
 
   Windows-MinGW:
     runs-on: windows-latest
+    env:
+      MRUBY_TARGET: travis
+      CFLAGS: -g -O1 -Wall -Wundef
     steps:
     - uses: actions/checkout@v1
     - name: chocolatey
       run: choco install -y ruby gperf
     - name: build
-      run: rake -E 'STDOUT.sync=true' -j4 gensym test
-      env:
-        MRUBY_TARGET: travis
-        CFLAGS: -g -O1 -Wall -Wundef
+      run: rake -E 'STDOUT.sync=true' -j4 gensym all test
 
   Windows-Cygwin:
     runs-on: windows-latest
+    env:
+      MRUBY_TARGET: travis
     steps:
     - uses: actions/checkout@v1
     - uses: actions/cache@v1
@@ -99,19 +84,17 @@ jobs:
     - name: Set ENV
       run: |
         echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
-    - name: build
-      shell: cmd
-      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -m
-      env:
-        MRUBY_TARGET: travis
-    - name: test
+    - name: build and test
       shell: cmd
-      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' gensym test
-      env:
-        MRUBY_TARGET: travis
+      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -m gensym all test
 
   Windows-VC:
     runs-on: windows-latest
+    env:
+      MRUBY_TARGET: appveyor
+      # TODO(take-cheeze): Re-enable /O2
+      CFLAGS: "/c /nologo /W3 /we4013 /Zi /MD /D_CRT_SECURE_NO_WARNINGS"
+      CXXFLAGS: "/c /nologo /W3 /Zi /MD /EHs /D_CRT_SECURE_NO_WARNINGS"
     steps:
     - uses: actions/checkout@v1
     - name: chocolatey
@@ -121,8 +104,3 @@ jobs:
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         rake -E "STDOUT.sync=true" gensym all test
-      env:
-        MRUBY_TARGET: appveyor
-        # TODO(take-cheeze): Re-enable /O2
-        CFLAGS: "/c /nologo /W3 /we4013 /Zi /MD /D_CRT_SECURE_NO_WARNINGS"
-        CXXFLAGS: "/c /nologo /W3 /Zi /MD /EHs /D_CRT_SECURE_NO_WARNINGS"
-- 
cgit v1.2.3