From c206ec764f4c138f3a6ae1897e3dacd4f85a3ece Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Fri, 10 Apr 2020 17:47:45 +0200
Subject: [PATCH] .github/workflows/ci.yml: some minor cleanup.

---
 .github/workflows/ci.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f9186e..af10bb7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,12 +28,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: OpenSSL
+    - name: OpenSSL OSX
+      if: runner.os == 'macOS'
       shell: bash
-      run: |
-        if [ "$RUNNER_OS" == "macOS" ]; then
-            brew install openssl
-        fi
+      run: brew install openssl
 
     - name: Qt - Ubuntu
       if: matrix.build == 'gui' && runner.os == 'Linux'
@@ -49,10 +47,11 @@ jobs:
     - name: Configure
       shell: bash
       run: |
+        OPTS="${{matrix.cmake-opts}}"
         if [ "$RUNNER_OS" == "macOS" ]; then
-            SSL_OPTS="-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1"
+            OPTS="-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 ${OPTS}"
         fi
-        cmake ${SSL_OPTS} ${{matrix.cmake-opts}} -B build
+        cmake ${OPTS} -B build
 
     - name: Build
       shell: bash