Add Actions mswin, update CI

5 files changed, 123 insertions, 95 deletions

diff --git a/.github/workflows/rvm.yml_ b/.github/workflows/rvm.yml_
new file mode 100644
index 00000000..ee5dcd21
--- /dev/null
+++ b/.github/workflows/rvm.yml_
@@ -0,0 +1,43 @@
+name: OpenSSL
+
+on: [push, pull_request]
+
+jobs:
+  # tests RVM Ruby 2.3.8 and master
+  rvm:
+    name: >-
+      ${{ matrix.ruby }}  ubuntu rvm
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        cfg:
+          - { ruby: '2.3.8' , openssl: 'libssl1.0-dev' }
+          - { ruby: '2.7.0' , openssl: ''              }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up RVM
+        run: |
+          curl -sSL https://get.rvm.io | bash
+      - name: Set up Ruby
+        run: |
+          source $HOME/.rvm/scripts/rvm
+          rvm install ${{ matrix.cfg.ruby }} --binary --autolibs=disable
+          rvm --default use ${{ matrix.cfg.ruby }}
+      - name: install openssl
+        if: matrix.cfg.openssl != ''
+        run: sudo apt-get -qy install ${{ matrix.cfg.openssl }}
+      - name: depends
+        run:  |
+          source $HOME/.rvm/scripts/rvm
+          rake install_dependencies
+      - name: compile
+        run:  |
+          source $HOME/.rvm/scripts/rvm
+          rake compile -- --enable-debug
+      - name: test
+        run:  |
+          source $HOME/.rvm/scripts/rvm
+          rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
+        env:
+          CI: true
\ No newline at end of file
diff --git a/.github/workflows/ubuntu-macos.yml b/.github/workflows/ubuntu-macos.yml
new file mode 100644
index 00000000..1a45c365
--- /dev/null
+++ b/.github/workflows/ubuntu-macos.yml
@@ -0,0 +1,33 @@
+name: Ubuntu-macOS
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: >-
+      ${{ matrix.ruby }}  ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ 'ubuntu-18.04', 'macos' ]
+        ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4, 2.3 ]
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: depends
+        run:  rake install_dependencies
+
+      - name: compile
+        run:  rake compile -- --enable-debug
+
+      - name: test
+        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
+        env:
+          CI: true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000..1638d25d
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,47 @@
+name: Windows
+
+on: [push, pull_request]
+
+jobs:
+  windows:
+    name: >-
+      ${{ matrix.ruby }}  windows-latest
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ mswin, mingw, 2.7, 2.6, 2.5, 2.4, 2.3 ]
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby, update gcc, install openssl
+        uses: MSP-Greg/actions-ruby@mswin
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          base: update
+          mingw: openssl
+
+      - name: depends
+        run:  rake install_dependencies
+
+      - name: compile
+        shell: cmd
+        env:
+          RVERS: ${{ matrix.ruby }}
+        run:  |
+          if "%RVERS%" == "mswin" (
+            call "%VCVARS%"
+            rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
+          ) else (
+            if "%RVERS%" == "2.3" (
+              rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
+            ) else (
+              rake compile -- --enable-debug
+            )
+          )
+
+      - name: test
+        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
+        env:
+          CI: true
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
deleted file mode 100644
index 02d44b95..00000000
--- a/.github/workflows/workflow.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-name: OpenSSL
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: >-
-      OS: ${{matrix.os}}  Ruby: ${{matrix.ruby}}
-    runs-on: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ 'ubuntu-18.04', 'macos' ]
-        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v2
-      - name: load ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{matrix.ruby}}
-      - name: depends
-        run:  rake install_dependencies
-      - name: compile
-        run:  rake compile -- --enable-debug
-      - name: test
-        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
-        env:
-          CI: true
-
-  # tests MinGW Ruby 2.3 thru master
-  mingw:
-    name: >-
-      OS: windows-latest  Ruby: ${{matrix.ruby}}
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '9.9.x', '2.6.x', '2.5.x', '2.4.x', '2.3.x' ]
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v2
-      - name: load ruby, update gcc, install openssl
-        uses: MSP-Greg/actions-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          base: update
-          mingw: openssl
-      - name: depends
-        run:  rake install_dependencies
-      - name: compile
-        run:  rake compile -- --enable-debug
-      - name: test
-        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
-        env:
-          CI: true
-
-  # tests RVM Ruby 2.3.8 and master
-  rvm:
-    name: >-
-      OS: ubuntu rvm  Ruby: ${{ matrix.cfg.ruby }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        cfg:
-          - { ruby: '2.3.8' , openssl: 'libssl1.0-dev' }
-          - { ruby: '2.7.0' , openssl: ''              }
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up RVM
-        run: |
-          curl -sSL https://get.rvm.io | bash
-      - name: Set up Ruby
-        run: |
-          source $HOME/.rvm/scripts/rvm
-          rvm install ${{ matrix.cfg.ruby }} --binary --autolibs=disable
-          rvm --default use ${{ matrix.cfg.ruby }}
-      - name: install openssl
-        if: matrix.cfg.openssl != ''
-        run: sudo apt-get -qy install ${{ matrix.cfg.openssl }}
-      - name: depends
-        run:  |
-          source $HOME/.rvm/scripts/rvm
-          rake install_dependencies
-      - name: compile
-        run:  |
-          source $HOME/.rvm/scripts/rvm
-          rake compile -- --enable-debug
-      - name: test
-        run:  |
-          source $HOME/.rvm/scripts/rvm
-          rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
-        env:
-          CI: true
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml_
index 18484fb9..18484fb9 100644
--- a/appveyor.yml
+++ b/appveyor.yml_