GHA: integrate unix and windows settings

2 files changed, 24 insertions, 53 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcc3c2c45f..e89873b39f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
     branches: 'master'
 
 jobs:
-  build:
+  unixish:
     name: ${{ matrix.os }} ${{ matrix.flavor }} (cc=${{ matrix.cc }})
     strategy:
       matrix:
@@ -81,3 +81,26 @@ jobs:
       - name: Cache dependencies
         if: ${{ success() }}
         run: ./ci/before_cache.sh
+
+  windows:
+    runs-on: windows-2016
+    env:
+      DEPS_BUILD_DIR: "C:/projects/nvim-deps"
+      DEPS_PREFIX: "C:/projects/nvim-deps/usr"
+
+    strategy:
+      matrix:
+        config: [ MINGW_64-gcov, MINGW_32, MSVC_64, MSVC_32 ]
+    name: windows (${{ matrix.config }})
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/cache@v2
+        with:
+          path: C:\projects\nvim-deps
+          key: ${{ matrix.config }}-${{ hashFiles('third-party\**') }}
+
+      - name: Run CI
+        run: powershell ci\build.ps1
+        env:
+          CONFIGURATION: ${{ matrix.config }}
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
deleted file mode 100644
index f12dde4816..0000000000
--- a/.github/workflows/ci_windows.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Run Windows CI
-
-on: [push, pull_request]
-
-env:
-  DEPS_BUILD_DIR: "C:/projects/nvim-deps"
-  DEPS_PREFIX: "C:/projects/nvim-deps/usr"
-  # Silence/redirect errors due to missing locking support (via libgcov).
-  # GCOV_ERROR_FILE: "$(TEMP)/libgcov-errors.log"
-
-jobs:
-  test:
-    runs-on: windows-2016
-    strategy:
-      matrix:
-        config: [ MINGW_64-gcov, MINGW_32, MSVC_64, MSVC_32 ]
-    name: Build and test
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v2
-        with:
-          path: C:\projects\nvim-deps
-          key: ${{ matrix.config }}-${{ hashFiles('third-party\**') }}
-
-      - uses: actions/setup-python@v2
-        with:
-          pyhon-version: '2.7'
-
-      - uses: actions/setup-python@v2
-        with:
-          pyhon-version: '3.5'
-
-
-      - uses: actions/setup-node@v1
-        with:
-          node-version: '12.x'
-
-      - name: Run CI
-        run: powershell ci\build.ps1
-        env:
-          CONFIGURATION: ${{ matrix.config }}
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: builds
-          if-no-files-found: ignore
-          # These files will be zipped (making Neovim.zip double zipped)
-          path: |
-            build\Neovim.zip
-            build\bin\nvim.exe