From d432688d9ff000fbe69e5ec8899fab340a7859a2 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Wed, 16 Dec 2020 21:56:32 +0900
Subject: [PATCH] Rename build configuration files for CI

Currently, there are build configuration files for CI, `travis.rb` and
`appveyor.rb`, but they are used for GCC/Clang and MSVC, not for Travis CI
and Appveyor, respectively.

Therefore, rename them to `gcc-clang.rb` and `msvc.rb`, respectively, and
move them under `build_config/ci/` to clarify that they are for CI.
---
 .github/workflows/build.yml                 | 14 +++++++-------
 .travis.yml                                 |  2 +-
 appveyor.yml                                |  2 +-
 build_config/{travis.rb => ci/gcc-clang.rb} |  0
 build_config/{appveyor.rb => ci/msvc.rb}    |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename build_config/{travis.rb => ci/gcc-clang.rb} (100%)
 rename build_config/{appveyor.rb => ci/msvc.rb} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 811a11cf5..2e76a5eeb 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_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
     steps:
     - uses: actions/checkout@v1
     - name: apt
@@ -17,7 +17,7 @@ jobs:
   Ubuntu-1804-gcc:
     runs-on: ubuntu-18.04
     env:
-      MRUBY_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
       CC: gcc
       CXX: g++
     steps:
@@ -30,7 +30,7 @@ jobs:
   Ubuntu-1804-clang:
     runs-on: ubuntu-18.04
     env:
-      MRUBY_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
       CC: clang
       CXX: clang++
     steps:
@@ -43,7 +43,7 @@ jobs:
   macOS:
     runs-on: macos-latest
     env:
-      MRUBY_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
     steps:
     - uses: actions/checkout@v1
     - name: brew
@@ -54,7 +54,7 @@ jobs:
   Windows-MinGW:
     runs-on: windows-latest
     env:
-      MRUBY_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
       CFLAGS: -g -O1 -Wall -Wundef
     steps:
     - uses: actions/checkout@v1
@@ -66,7 +66,7 @@ jobs:
   Windows-Cygwin:
     runs-on: windows-latest
     env:
-      MRUBY_CONFIG: travis
+      MRUBY_CONFIG: ci/gcc-clang
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     steps:
     - uses: actions/checkout@v1
@@ -92,7 +92,7 @@ jobs:
   Windows-VC:
     runs-on: windows-latest
     env:
-      MRUBY_CONFIG: appveyor
+      MRUBY_CONFIG: ci/msvc
       # 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"
diff --git a/.travis.yml b/.travis.yml
index 7da3d40a9..f3ed6a73e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ jobs:
       - export PATH="/usr/local/opt/bison/bin:$PATH"
 
 env:
-  - MRUBY_CONFIG=travis
+  - MRUBY_CONFIG=ci/gcc-clang
 
 script:
   - rake gensym && rake -m && rake test
diff --git a/appveyor.yml b/appveyor.yml
index e2a79f20d..d05696e69 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ init:
 
 
 build_script:
-  - set MRUBY_CONFIG=appveyor
+  - set MRUBY_CONFIG=ci/msvc
   - rake gensym
   - rake -m all
   - rake -E $stdout.sync=true test
diff --git a/build_config/travis.rb b/build_config/ci/gcc-clang.rb
similarity index 100%
rename from build_config/travis.rb
rename to build_config/ci/gcc-clang.rb
diff --git a/build_config/appveyor.rb b/build_config/ci/msvc.rb
similarity index 100%
rename from build_config/appveyor.rb
rename to build_config/ci/msvc.rb