3 files changed, 7 insertions, 73 deletions
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
deleted file mode 100644
index 4d75508..0000000
--- a/.github/workflows/mac.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: mac
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macOS-latest]
-
-    steps:
-    - uses: actions/checkout@v1
-    #- uses: egorpugin/sw-action@master
-
-    - name: Download SW
-      shell: cmake -P {0}
-      run: |
-        if (WIN32)
-          file(DOWNLOAD "https://software-network.org/client/sw-master-windows-client.zip" ./sw.zip)
-        elseif (APPLE)
-          file(DOWNLOAD "https://software-network.org/client/sw-master-macos-client.tar.gz" ./sw.zip)
-        else()
-          file(DOWNLOAD "https://software-network.org/client/sw-master-linux-client.tar.gz" ./sw.zip)
-        endif()
-
-    - name: Unpack SW
-      run: cmake -E tar xvf sw.zip
-
-    - name: chmod
-      run: chmod 755 sw
-      shell: sh
-
-    - name: build
-      run: ./sw build
diff --git a/.github/workflows/linux.yml b/.github/workflows/sw.yml
index b0ef994..a58f77c 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/sw.yml
@@ -1,13 +1,14 @@
-name: linux
+name: sw
 
-on: [push]
+on: [push, pull-request]
 
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [windows-latest, ubuntu-latest, macOS-latest]
 
     steps:
     - uses: actions/checkout@v1
@@ -33,3 +34,6 @@ jobs:
 
     - name: build
       run: ./sw build
+
+    - name: test
+      run: ./sw test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 1f8c89f..0000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: windows
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [windows-latest]
-
-    steps:
-    - uses: actions/checkout@v1
-    #- uses: egorpugin/sw-action@master
-
-    - name: Download SW
-      shell: cmake -P {0}
-      run: |
-        if (WIN32)
-          file(DOWNLOAD "https://software-network.org/client/sw-master-windows-client.zip" ./sw.zip)
-        elseif (APPLE)
-          file(DOWNLOAD "https://software-network.org/client/sw-master-macos-client.tar.gz" ./sw.zip)
-        else()
-          file(DOWNLOAD "https://software-network.org/client/sw-master-linux-client.tar.gz" ./sw.zip)
-        endif()
-
-    - name: Unpack SW
-      run: cmake -E tar xvf sw.zip
-
-    - name: chmod
-      run: chmod 755 sw
-      shell: sh
-
-    - name: build
-      run: ./sw build