Skip to content

Commit

Permalink
rearrange GH runner steps
Browse files Browse the repository at this point in the history
Signed-off-by: Martin <[email protected]>
Ho-Ro committed Mar 9, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 0935c91 commit fe5af58
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/build_check.yml
Original file line number Diff line number Diff line change
@@ -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 \

0 comments on commit fe5af58

Please sign in to comment.