From e55410dc80acd7d40f8a30007870d1ce7ce33034 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Fri, 28 May 2021 04:53:27 -0500
Subject: update badges, further split out actions by OS, add more Linux
 targets

---
 .github/workflows/android_test.yml |  4 ++--
 .github/workflows/cross_test.yml   | 20 ++++++++++++++++++++
 .github/workflows/linux_test.yml   | 22 ++--------------------
 .github/workflows/macos_test.yml   | 22 ++++++++++++++++++++++
 4 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/cross_test.yml
 create mode 100644 .github/workflows/macos_test.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml
index ea09846..1632972 100644
--- a/.github/workflows/android_test.yml
+++ b/.github/workflows/android_test.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run CI script
-      run: ./scripts/travis
+      run: ./scripts/test
 
   build-android-10-11:
     runs-on: ubuntu-18.04
@@ -27,4 +27,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Run CI script
-      run: ./scripts/travis
+      run: ./scripts/test
diff --git a/.github/workflows/cross_test.yml b/.github/workflows/cross_test.yml
new file mode 100644
index 0000000..9bcbfac
--- /dev/null
+++ b/.github/workflows/cross_test.yml
@@ -0,0 +1,20 @@
+name: cross_ci
+
+on: [push, pull_request]
+
+jobs:
+  build-other:
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+        arch: [mingw32, mingw64, arm32, arm64]
+    runs-on: ${{ matrix.os }}
+    continue-on-error: true
+    env:
+      CC: gcc
+      ARCH: ${{ matrix.arch }}
+    name: ${{ matrix.arch }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run CI script
+      run: ./scripts/test
diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml
index 42b3834..028c1a4 100644
--- a/.github/workflows/linux_test.yml
+++ b/.github/workflows/linux_test.yml
@@ -6,7 +6,7 @@ jobs:
   build-native:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-18.04]
+        os: [ubuntu-18.04, ubuntu-20.04]
         compiler: [clang, gcc]
     runs-on: ${{ matrix.os }}
     continue-on-error: false
@@ -15,24 +15,6 @@ jobs:
       ARCH: native
     name: ${{ matrix.compiler }} - ${{ matrix.os }}
     steps:
-    - name: Install packages for macos
-      if: matrix.os == 'macos-latest'
-      run: brew install automake
     - uses: actions/checkout@v2
     - name: Run CI script
-      run: ./scripts/travis
-
-  build-other:
-    strategy:
-      matrix:
-        arch: [mingw32, mingw64, arm32, arm64]
-    runs-on: ubuntu-18.04
-    continue-on-error: true
-    env:
-      CC: gcc
-      ARCH: ${{ matrix.arch }}
-    name: ${{ matrix.arch }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Run CI script
-      run: ./scripts/travis
+      run: ./scripts/test
diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml
new file mode 100644
index 0000000..29e6cdc
--- /dev/null
+++ b/.github/workflows/macos_test.yml
@@ -0,0 +1,22 @@
+name: macos_ci
+
+on: [push, pull_request]
+
+jobs:
+  build-native:
+    strategy:
+      matrix:
+        os: [macos-latest]
+        compiler: [clang, gcc]
+    runs-on: ${{ matrix.os }}
+    continue-on-error: false
+    env:
+      CC: ${{ matrix.compiler }}
+      ARCH: native
+    name: ${{ matrix.compiler }} - ${{ matrix.os }}
+    steps:
+    - name: Install packages for macos
+      run: brew install automake
+    - uses: actions/checkout@v2
+    - name: Run CI script
+      run: ./scripts/test
-- 
cgit v1.2.3-55-g6feb