From 81c21088196fd92d08c253efc2feb8dbead88acf Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Mon, 19 Oct 2020 15:03:22 +0900
Subject: Revert `MRUBY_TARGET` mechanism; ref #5096

* In explanation of mruby, the expression `build_config.rb` is frequently
  used including official documents, so I think that it will not make sense
  if the file is no longer used.
* The `MRUBY_TARGET` mechanism seems to have little improvement, so I don't
  think it should be changed to avoid unnecessary confusion.
* `MRUBY_TARGET` and `MRuby.targets` represent somewhat different things,
  so using the same term "target" is a bit confusing.

The mechanism that can be written short when using a file under
`build_config` (renamed from `target`) directory remains
(`build_config/${MRUBY_CONFIG}.rb` is used if the path specified
in `MRUBY_CONFIG` doesn't exist).
---
 .github/workflows/build.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95f7c40d8..56fbe86c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ jobs:
   Ubuntu-1604:
     runs-on: ubuntu-16.04
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
     steps:
     - uses: actions/checkout@v1
     - name: apt
@@ -17,7 +17,7 @@ jobs:
   Ubuntu-1804-gcc:
     runs-on: ubuntu-18.04
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
       CC: gcc
       CXX: g++
     steps:
@@ -30,7 +30,7 @@ jobs:
   Ubuntu-1804-clang:
     runs-on: ubuntu-18.04
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
       CC: clang
       CXX: clang++
     steps:
@@ -43,7 +43,7 @@ jobs:
   macOS:
     runs-on: macos-latest
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
     steps:
     - uses: actions/checkout@v1
     - name: brew
@@ -54,7 +54,7 @@ jobs:
   Windows-MinGW:
     runs-on: windows-latest
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
       CFLAGS: -g -O1 -Wall -Wundef
     steps:
     - uses: actions/checkout@v1
@@ -66,7 +66,7 @@ jobs:
   Windows-Cygwin:
     runs-on: windows-latest
     env:
-      MRUBY_TARGET: travis
+      MRUBY_CONFIG: travis
     steps:
     - uses: actions/checkout@v1
     - uses: actions/cache@v1
@@ -91,7 +91,7 @@ jobs:
   Windows-VC:
     runs-on: windows-latest
     env:
-      MRUBY_TARGET: appveyor
+      MRUBY_CONFIG: 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