Skip to content

Commit 66ec517

Browse files
author
Martin Homuth-Rosemann
committed
reorder GitHub runner script
Signed-off-by: Martin Homuth-Rosemann <horo@guardi.fritz.box>
1 parent 898f7d5 commit 66ec517

File tree

1 file changed

+88
-84
lines changed

1 file changed

+88
-84
lines changed

‎.github/workflows/build.yml‎

Lines changed: 88 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# --- Linux (Ubuntu) amd64 steps ---
3636
# ----------------------------------
3737
#
38-
linux-x86_64:
38+
linux-amd64:
3939
runs-on: ubuntu-24.04
4040
steps:
4141

@@ -59,7 +59,7 @@ jobs:
5959
echo "git_describe=$(git describe)"
6060
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
6161

62-
- name: Install Ubuntu Build Requirements
62+
- name: Install Linux amd64 Build Requirements
6363
run: |
6464
mkdir build
6565
sudo apt update
@@ -69,7 +69,7 @@ jobs:
6969
libqt6core6t64 libqt6gui6 libqt6widgets6 libqt6printsupport6 \
7070
libqt6opengl6 libqt6openglwidgets6 qt6-tools-dev
7171

72-
- name: Ubuntu Build
72+
- name: Linux amd64 Build
7373
# GitHub hosts Linux runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
7474
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
7575
working-directory: ${{github.workspace}}/build
@@ -80,14 +80,14 @@ jobs:
8080
fakeroot make -j8 package
8181
ls -l packages
8282

83-
- name: Upload Ubuntu Artifacts
83+
- name: Upload Linux amd64 Artifacts
8484
# *.deb *.rpm *.tgz
8585
uses: actions/upload-artifact@v4
8686
with:
8787
name: openhantek_${{ steps.config_git.outputs.git_describe }}_linux_amd64
8888
path: ${{github.workspace}}/build/packages/*
8989

90-
- name: Upload Linux Release Assets
90+
- name: Upload Linux amd64 Release Assets
9191
if: startsWith(github.ref, 'refs/tags/')
9292
uses: softprops/action-gh-release@v1
9393
with:
@@ -125,7 +125,7 @@ jobs:
125125
echo "git_describe=$(git describe)"
126126
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
127127

128-
- name: Install Ubuntu Build Requirements
128+
- name: Install Linux arm64 Build Requirements
129129
run: |
130130
mkdir build
131131
sudo apt update
@@ -135,7 +135,7 @@ jobs:
135135
libqt6core6t64 libqt6gui6 libqt6widgets6 libqt6printsupport6 \
136136
libqt6opengl6 libqt6openglwidgets6 qt6-tools-dev
137137

138-
- name: Ubuntu Build
138+
- name: Linux arm64 Build
139139
# GitHub hosts Linux runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
140140
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
141141
working-directory: ${{github.workspace}}/build
@@ -146,14 +146,14 @@ jobs:
146146
fakeroot make -j8 package
147147
ls -l packages
148148

149-
- name: Upload Ubuntu Artifacts
149+
- name: Upload Linux arm64 Artifacts
150150
# *.deb *.rpm *.tgz
151151
uses: actions/upload-artifact@v4
152152
with:
153153
name: openhantek_${{ steps.config_git.outputs.git_describe }}_linux_arm64
154154
path: ${{github.workspace}}/build/packages/*
155155

156-
- name: Upload Linux Release Assets
156+
- name: Upload Linux arm64 Release Assets
157157
if: startsWith(github.ref, 'refs/tags/')
158158
uses: softprops/action-gh-release@v1
159159
with:
@@ -164,10 +164,10 @@ jobs:
164164

165165

166166
# -------------------------
167-
# --- macOS intel steps ---
167+
# --- macOS amd64 steps ---
168168
# -------------------------
169169
#
170-
macos-intel:
170+
macos-amd64:
171171
runs-on: macos-13
172172
steps:
173173

@@ -191,7 +191,7 @@ jobs:
191191
echo "git_describe=$(git describe)"
192192
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
193193

194-
- name: Install macOS Build Requirements
194+
- name: Install macOS intel Build Requirements
195195
run: |
196196
mkdir build
197197
brew install qt@6 fftw binutils create-dmg || true
@@ -234,7 +234,7 @@ jobs:
234234
- name: Upload macOS intel Artifacts
235235
uses: actions/upload-artifact@v4
236236
with:
237-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_osx_intel
237+
name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_amd64
238238
path: ${{github.workspace}}/build/packages/*
239239

240240
- name: Upload macOS intel Release Assets
@@ -318,7 +318,7 @@ jobs:
318318
- name: Upload macOS arm64 Artifacts
319319
uses: actions/upload-artifact@v4
320320
with:
321-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_osx_arm64
321+
name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_arm64
322322
path: ${{github.workspace}}/build/packages/*
323323

324324
- name: Upload macOS arm64 Release Assets
@@ -331,6 +331,77 @@ jobs:
331331
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
332332

333333

334+
# --------------------------
335+
# --- Windows MSVC steps ---
336+
# --------------------------
337+
#
338+
windows-msvc_x64:
339+
runs-on: windows-2022
340+
steps:
341+
342+
# --- Clone the latest commit ---
343+
- name: Checkout
344+
uses: actions/checkout@v3
345+
with:
346+
fetch-tags: true
347+
submodules: recursive
348+
fetch-depth: 0
349+
350+
# --- Config git and get the version from "git describe" ---
351+
- name: Config Git
352+
id: config_git
353+
shell: bash
354+
run: |
355+
git config user.email "Ho-Ro@users.noreply.github.com"
356+
git config user.name "Ho-Ro"
357+
git fetch --tags --force || true
358+
git submodule update --init --recursive
359+
echo "git_describe=$(git describe)"
360+
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
361+
362+
- name: Install Qt for Windows
363+
uses: jurplel/install-qt-action@v4
364+
365+
- name: Setup Windows MSVC Build
366+
run:
367+
md build &
368+
call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
369+
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
370+
371+
- name: Windows MSVC Build
372+
# GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
373+
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
374+
working-directory: ${{github.workspace}}/build
375+
shell: bash
376+
run: |
377+
cmake --build . --parallel 8 --config Release --target package
378+
ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
379+
rm -f packages/openhantek_*_msvc_x64.*
380+
cd openhantek/Release
381+
7z a ../../packages/$ZIP *
382+
cd ../..
383+
ls -l packages
384+
385+
- name: Upload Windows MSVC Artifacts
386+
uses: actions/upload-artifact@v4
387+
with:
388+
name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
389+
path: ./build/packages/*.zip
390+
391+
- name: Upload Windows MSVC Release Assets
392+
if: startsWith(github.ref, 'refs/tags/')
393+
uses: softprops/action-gh-release@v1
394+
with:
395+
prerelease: true
396+
files: ./build/packages/*
397+
env:
398+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
399+
400+
401+
############################################
402+
# The MINGW build is currently not working #
403+
############################################
404+
334405
# # ---------------------------
335406
# # --- Windows MINGW steps ---
336407
# # ---------------------------
@@ -383,16 +454,16 @@ jobs:
383454
# shell: bash
384455
# run: |
385456
# # this ZIP package contains only OpenHantek.exe, just get the name
386-
# ZIP=$(basename packages/openhantek_*_mingw_x64.zip)
387-
# rm -f packages/openhantek_*_mingw_x64.*
457+
# ZIP=$(basename packages/openhantek_*_mingw_amd64.zip)
458+
# rm -f packages/openhantek_*_mingw_amd64.*
388459
# cd openhantek
389460
# 7z a ../packages/$ZIP *.exe driver documents
390461
# ls -l ../packages
391462

392463
# - name: Upload Windows Artifacts
393464
# uses: actions/upload-artifact@v4
394465
# with:
395-
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_x64
466+
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_amd64
396467
# path: ./build/packages/*.zip
397468

398469
# - name: Upload Windows Release Assets
@@ -404,70 +475,3 @@ jobs:
404475
# env:
405476
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
406477

407-
408-
# --------------------------
409-
# --- Windows MSVC steps ---
410-
# --------------------------
411-
#
412-
windows-msvc_x64:
413-
runs-on: windows-2022
414-
steps:
415-
416-
# --- Clone the latest commit ---
417-
- name: Checkout
418-
uses: actions/checkout@v3
419-
with:
420-
fetch-tags: true
421-
submodules: recursive
422-
fetch-depth: 0
423-
424-
# --- Config git and get the version from "git describe" ---
425-
- name: Config Git
426-
id: config_git
427-
shell: bash
428-
run: |
429-
git config user.email "Ho-Ro@users.noreply.github.com"
430-
git config user.name "Ho-Ro"
431-
git fetch --tags --force || true
432-
git submodule update --init --recursive
433-
echo "git_describe=$(git describe)"
434-
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
435-
436-
- name: Install Qt for Windows
437-
uses: jurplel/install-qt-action@v4
438-
439-
- name: Setup Windows MSVC Build
440-
run:
441-
md build &
442-
call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
443-
cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
444-
445-
- name: Windows MSVC Build
446-
# GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
447-
# 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
448-
working-directory: ${{github.workspace}}/build
449-
shell: bash
450-
run: |
451-
cmake --build . --parallel 8 --config Release --target package
452-
ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
453-
rm -f packages/openhantek_*_msvc_x64.*
454-
cd openhantek/Release
455-
7z a ../../packages/$ZIP *
456-
cd ../..
457-
ls -l packages
458-
459-
- name: Upload Windows MSVC Artifacts
460-
uses: actions/upload-artifact@v4
461-
with:
462-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
463-
path: ./build/packages/*.zip
464-
465-
- name: Upload Windows MSVC Release Assets
466-
if: startsWith(github.ref, 'refs/tags/')
467-
uses: softprops/action-gh-release@v1
468-
with:
469-
prerelease: true
470-
files: ./build/packages/*
471-
env:
472-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
473-

0 commit comments

Comments
 (0)