From 67aad0017f761133abb05270293c4afad7ecffd5 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 7 Jul 2020 18:36:57 +0200
Subject: Simplify workflows

---
 .github/workflows/frontend.yml   | 33 +++++++++++++++++-------------
 .github/workflows/web-server.yml | 43 ++++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 33 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 494c0829..39910bc8 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -2,20 +2,25 @@ name: Frontend
 
 on: [push]
 
+defaults:
+    run:
+        working-directory: frontend
+
 jobs:
     build:
-        runs-on: ubuntu-latest
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ubuntu-latest]
+                node: [12.x]
         steps:
-            -   uses: actions/checkout@v2
-            -   name: Set up Node.js
-                uses: actions/setup-node@v1
-                with:
-                    node-version: 12.x
-            -   run: npm install
-                working-directory: frontend
-            -   run: npm run build --if-present
-                working-directory: frontend
-            -   run: npm test
-                working-directory: frontend
-                env:
-                    CI: true
+        - uses: actions/checkout@v2
+        - name: Set up Node.js
+          uses: actions/setup-node@v1
+          with:
+            node-version: ${{ matrix.node }}
+        - run: npm install
+        - run: npm run build --if-present
+        - run: npm test
+          env:
+            CI: true
diff --git a/.github/workflows/web-server.yml b/.github/workflows/web-server.yml
index af843266..1ba2b6cd 100644
--- a/.github/workflows/web-server.yml
+++ b/.github/workflows/web-server.yml
@@ -2,25 +2,30 @@ name: Web server
 
 on: [push]
 
+defaults:
+    run:
+        working-directory: web-server
+
 jobs:
     build:
-        runs-on: ubuntu-latest
+        runs-on: ${{ matrix.os }}
+        strategy:
+            matrix:
+                os: [ubuntu-latest]
+                python: [3.8]
         steps:
-            -   uses: actions/checkout@v2
-            -   name: Set up Python
-                uses: actions/setup-python@v2
-                with:
-                    python-version: 3.8
-            -   name: Install dependencies
-                working-directory: web-server
-                run: |
-                    python -m pip install --upgrade pip
-                    pip install -r requirements.txt
-            -   name: Lint with pylint
-                working-directory: web-server
-                run: |
-                    ./check.sh
-            -   name: Test with pytest
-                working-directory: web-server
-                run: |
-                    pytest opendc
+        - uses: actions/checkout@v2
+        - name: Set up Python
+          uses: actions/setup-python@v2
+          with:
+            python-version: ${{ matrix.python }}
+        - name: Install dependencies
+          run: |
+            python -m pip install --upgrade pip
+            pip install -r requirements.txt
+        - name: Lint with pylint
+          run: |
+            ./check.sh
+        - name: Test with pytest
+          run: |
+            pytest opendc
-- 
cgit v1.2.3