Merge pull request #1176 from junaruga/wip/refactor-ci

Refactor CI yaml files

Author: sodabrew

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
     # Run all the tests on the new environment as much as possible.
     # https://docs.github.com/en/free-pro-team@latest/actions/reference/specifications-for-github-hosted-runners
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.allow-failure }}
+    continue-on-error: ${{ matrix.allow-failure || false }}
     strategy:
       matrix:
         os:
@@ -26,16 +26,15 @@ jobs:
           - 2.2
           - 2.1
         db: ['']
-        allow-failure: [false]
         include:
           # Allow failure due to Mysql2::Error: Unknown system variable 'session_track_system_variables'.
           - {os: ubuntu-16.04, ruby: 2.4, db: mariadb10.0, allow-failure: true}
           # Comment out due to ci/setup.sh stucking.
-          # - {os: ubuntu-18.04, ruby: 2.4, db: mariadb10.1, allow-failure: false}
-          # Allow failure due to the issue #1165.
-          - {os: ubuntu-20.04, ruby: 2.4, db: mariadb10.3, allow-failure: true}
-          - {os: ubuntu-18.04, ruby: 2.4, db: mysql57, allow-failure: false}
+          # - {os: ubuntu-18.04, ruby: 2.4, db: mariadb10.1}
           # `service mysql restart` fails.
+          - {os: ubuntu-20.04, ruby: 2.4, db: mariadb10.3, allow-failure: true}
+          - {os: ubuntu-18.04, ruby: 2.4, db: mysql57}
+          # Allow failure due to the issue #1165.
           - {os: ubuntu-20.04, ruby: 2.4, db: mysql80, allow-failure: true}
           - {os: ubuntu-18.04, ruby: 'head', db: '', allow-failure: true}
           # db: A DB's brew package name in macOS case.

.github/workflows/container.yml

@@ -5,13 +5,14 @@ on: [push, pull_request]
 jobs:
   build:
     name: >-
-      ${{ matrix.distro }} ${{ matrix.image }}
+      ${{ matrix.distro }} ${{ matrix.image }} ${{ matrix.name_extra || '' }}
     runs-on: ubuntu-20.04 # focal
-    continue-on-error: ${{ matrix.allow-failure }}
+    continue-on-error: ${{ matrix.allow-failure || false }}
     strategy:
       matrix:
         include:
-          - {distro: centos, image: 'centos:7', allow-failure: false}
+          # CentOS 7 system Ruby is the fixed version 2.0.0.
+          - {distro: centos, image: 'centos:7', name_extra: 'ruby 2.0.0'}
           # Fedora latest stable version
           # Allow failure due to the following test failures.
           # https://github.com/brianmario/mysql2/issues/965

.travis.yml

@@ -1,4 +1,3 @@
-sudo: required
 dist: trusty
 language: ruby
 bundler_args: --without development
@@ -9,17 +8,8 @@ before_install:
   - gem update bundler
   - gem --version
   - bash ci/setup.sh
-addons:
-  hosts:
-    - mysql2gem.example.com
-  apt:
-    packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
 matrix:
   include:
-    - rvm: 2.0.0
     - rvm: 2.4
       env: DB=mariadb10.0
       addons: