ci: merge osx and windows into ci.yml

and trim Appveyor to just 32-bit
sparklemotion · May 20, 2021 · f86b71b · f86b71b
1 parent b46b7bc
commit f86b71b
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 128 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -134,6 +134,59 @@ jobs:
       - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
       - run: bundle exec rake test:valgrind
 
+  osx:
+    needs: ["basic"]
+    strategy:
+      fail-fast: false
+      matrix:
+        sys: ["enable", "disable"]
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
+    name: "osx / ${{matrix.ruby}} / syslib-${{matrix.sys}}"
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+      - uses: actions/cache@v2
+        if: matrix.sys == 'disable'
+        with:
+          path: ports/archives
+          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          restore-keys: tarballs-
+      - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
+      - run: bundle exec rake test
+
+  windows:
+    needs: ["basic"]
+    strategy:
+      fail-fast: false
+      matrix:
+        sys: ["enable", "disable"]
+        ruby: ["2.5", "2.6", "2.7", "3.0", "mingw"]
+    name: "windows / ${{matrix.ruby}} / syslib-${{matrix.sys}}"
+    runs-on: windows-latest
+    steps:
+      - name: configure git crlf
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+      - uses: actions/checkout@v2
+      - uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          ruby-version: "${{matrix.ruby}}"
+          mingw: "libxml2 libxslt"
+          bundler-cache: true
+      - uses: actions/cache@v2
+        if: matrix.sys == 'disable'
+        with:
+          path: ports/archives
+          key: tarballs-${{hashFiles('**/dependencies.yml')}}
+          restore-keys: tarballs-
+      - run: bundle exec rake compile -- --${{matrix.sys}}-system-libraries
+      - run: bundle exec rake test
+
   jruby:
     needs: ["basic"]
     strategy:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
diff --git a/appveyor.yml b/appveyor.yml
@@ -33,36 +33,12 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: head-x64
-    - ruby_version: head-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
-      EXTCONF_PARAMS: "--use-system-libraries"
-
-    - ruby_version: 30-x64
-    - ruby_version: 30-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
-      EXTCONF_PARAMS: "--use-system-libraries"
-
-    - ruby_version: 27-x64
-    - ruby_version: 27-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
+    - ruby_version: 30
+    - ruby_version: 30
+      INSTALL_PACKAGES: "mingw-w64-i686-libxslt"
       EXTCONF_PARAMS: "--use-system-libraries"
 
     - ruby_version: 27
     - ruby_version: 27
       INSTALL_PACKAGES: "mingw-w64-i686-libxslt"
       EXTCONF_PARAMS: "--use-system-libraries"
-
-    - ruby_version: 26-x64
-    - ruby_version: 26-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
-      EXTCONF_PARAMS: "--use-system-libraries"
-
-    - ruby_version: 25-x64
-    - ruby_version: 25-x64
-      INSTALL_PACKAGES: "mingw-w64-x86_64-libxslt"
-      EXTCONF_PARAMS: "--use-system-libraries"
-
-matrix:
-  allow_failures:
-    - ruby_version: head-x64