From fe5af5816f8414d33fadfc1955ab22b87e4885a8 Mon Sep 17 00:00:00 2001
From: Martin <Ho-Ro@users.noreply.github.com>
Date: Thu, 9 Mar 2023 11:36:20 +0100
Subject: [PATCH] rearrange GH runner steps

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
---
 .github/workflows/build_check.yml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index c54bf066..ff1613f9 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -58,9 +58,6 @@ jobs:
         sudo apt -y upgrade
         sudo apt install g++ make cmake fakeroot rpm qttools5-dev libfftw3-dev binutils-dev \
           libusb-1.0-0-dev libqt5opengl5-dev mesa-common-dev libgl1-mesa-dev libgles2-mesa-dev
-        cd build
-        cp ../CHANGELOG changelog
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
 
     - name: Ubuntu Build
@@ -69,6 +66,8 @@ jobs:
       working-directory: ${{github.workspace}}/build
       if: startsWith(matrix.os, 'ubuntu')
       run: |
+        cp ../CHANGELOG changelog
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
         make -j8
         fakeroot make -j8 package
         ls -l packages
@@ -91,14 +90,10 @@ jobs:
         mkdir build
         brew update
         brew install qt5 fftw binutils create-dmg || true
-        export Qt5_DIR=$(brew --prefix qt5)
         # the next two commands (hack from @warpme) fix #314
         mkdir -p /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework
         ln -sf /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib \
           /usr/local/opt/qt5/lib/libgcc_s.1.1.dylib.framework/libgcc_s.1.1.dylib
-        cd build
-        cp ../CHANGELOG changelog
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=${Qt5_DIR}
 
 
     - name: macOS Build
@@ -107,15 +102,16 @@ jobs:
       working-directory: ${{github.workspace}}/build
       if: startsWith(matrix.os, 'macos')
       run: |
+        cp ../CHANGELOG changelog
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)
         make -j12
         sudo make -j12 package
         if test -d openhantek/OpenHantek.app; then
-          export Qt5_DIR=$(brew --prefix qt5)
           export PATH=${Qt5_DIR}/bin:${PATH}
           cd openhantek
           macdeployqt OpenHantek.app -always-overwrite -verbose=1
           python ../../utils/macdeployqtfix/macdeployqtfix.py \
-            --quiet OpenHantek.app/Contents/MacOS/OpenHantek ${Qt5_DIR}
+            --quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt5)
           create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns \
             --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
             --skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \