Skip to content

Commit f3684a1

Browse files
Ho-RoHo-Ro
committed
The macOS build is currently not working
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent b24c854 commit f3684a1

File tree

2 files changed

+177
-168
lines changed

2 files changed

+177
-168
lines changed

‎.github/workflows/build.yml‎

Lines changed: 172 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -163,174 +163,6 @@ jobs:
163163
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
164164

165165

166-
# -------------------------
167-
# --- macOS amd64 steps ---
168-
# -------------------------
169-
#
170-
macos-amd64:
171-
runs-on: macos-13
172-
steps:
173-
174-
# --- Clone the latest commit ---
175-
- name: Checkout
176-
uses: actions/checkout@v3
177-
with:
178-
fetch-tags: true
179-
submodules: recursive
180-
fetch-depth: 0
181-
182-
# --- Config git and get the version from "git describe" ---
183-
- name: Config Git
184-
id: config_git
185-
shell: bash
186-
run: |
187-
git config user.email "Ho-Ro@users.noreply.github.com"
188-
git config user.name "Ho-Ro"
189-
git fetch --tags --force || true
190-
git submodule update --init --recursive
191-
echo "git_describe=$(git describe)"
192-
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
193-
194-
- name: Install macOS intel Build Requirements
195-
run: |
196-
mkdir build
197-
brew install qt@6 fftw binutils create-dmg || true
198-
199-
- name: macOS intel Build
200-
# GitHub hosts macOS runners in GitHub's own macOS Cloud:
201-
# 4-core CPU, 14 GB of RAM memory, 14 GB of SSD disk space
202-
working-directory: ${{github.workspace}}/build
203-
run: |
204-
cp ../CHANGELOG changelog
205-
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$(brew --prefix qt@6)
206-
make -j16
207-
sudo make -j16 package
208-
if test -d openhantek/OpenHantek.app; then
209-
export PATH=$(brew --prefix qt@6)/bin:${PATH}
210-
cd openhantek
211-
macdeployqt OpenHantek.app -always-overwrite -verbose=1
212-
python ../../utils/macdeployqtfix/macdeployqtfix.py \
213-
--quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt@6)
214-
create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns \
215-
--window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
216-
--skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \
217-
--eula ../../LICENSE OpenHantek.dmg OpenHantek.app
218-
cd ..
219-
else
220-
true
221-
fi
222-
if test -d openhantek/OpenHantek.app; then
223-
cd openhantek
224-
sudo tar -czf ../packages/openhantek_*_macos_*.tar.gz OpenHantek.app
225-
if test -f OpenHantek.dmg; then
226-
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_macos_*.tar.gz .tar.gz).dmg
227-
fi
228-
cd ..
229-
ls -l packages
230-
else
231-
true
232-
fi
233-
234-
- name: Upload macOS intel Artifacts
235-
uses: actions/upload-artifact@v4
236-
with:
237-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_amd64
238-
path: ${{github.workspace}}/build/packages/*
239-
240-
- name: Upload macOS intel Release Assets
241-
if: startsWith(github.ref, 'refs/tags/')
242-
uses: softprops/action-gh-release@v1
243-
with:
244-
prerelease: true
245-
files: ./build/packages/*
246-
env:
247-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
248-
249-
250-
# -------------------------
251-
# --- macOS arm64 steps ---
252-
# -------------------------
253-
#
254-
macos-arm64:
255-
runs-on: macos-14
256-
steps:
257-
258-
# --- Clone the latest commit ---
259-
- name: Checkout
260-
uses: actions/checkout@v3
261-
with:
262-
fetch-tags: true
263-
submodules: recursive
264-
fetch-depth: 0
265-
266-
# --- Config git and get the version from "git describe" ---
267-
- name: Config Git
268-
id: config_git
269-
shell: bash
270-
run: |
271-
git config user.email "Ho-Ro@users.noreply.github.com"
272-
git config user.name "Ho-Ro"
273-
git fetch --tags --force || true
274-
git submodule update --init --recursive
275-
echo "git_describe=$(git describe)"
276-
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
277-
278-
- name: Install macOS Build Requirements
279-
run: |
280-
mkdir build
281-
brew install qt@6 fftw binutils create-dmg || true
282-
283-
- name: macOS arm64 Build
284-
# GitHub hosts macOS runners in GitHub's own macOS Cloud:
285-
# 3-core M1 CPU, 14 GB of RAM memory, 7 GB of SSD disk space
286-
working-directory: ${{github.workspace}}/build
287-
run: |
288-
cp ../CHANGELOG changelog
289-
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$(brew --prefix qt@6)
290-
make -j12
291-
sudo make -j12 package
292-
if test -d openhantek/OpenHantek.app; then
293-
export PATH=$(brew --prefix qt@6)/bin:${PATH}
294-
cd openhantek
295-
macdeployqt OpenHantek.app -always-overwrite -verbose=1
296-
python ../../utils/macdeployqtfix/macdeployqtfix.py \
297-
--quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt@6)
298-
create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns \
299-
--window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
300-
--skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \
301-
--eula ../../LICENSE OpenHantek.dmg OpenHantek.app
302-
cd ..
303-
else
304-
true
305-
fi
306-
if test -d openhantek/OpenHantek.app; then
307-
cd openhantek
308-
sudo tar -czf ../packages/openhantek_*_macos_*.tar.gz OpenHantek.app
309-
if test -f OpenHantek.dmg; then
310-
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_macos_*.tar.gz .tar.gz).dmg
311-
fi
312-
cd ..
313-
ls -l packages
314-
else
315-
true
316-
fi
317-
318-
- name: Upload macOS arm64 Artifacts
319-
uses: actions/upload-artifact@v4
320-
with:
321-
name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_arm64
322-
path: ${{github.workspace}}/build/packages/*
323-
324-
- name: Upload macOS arm64 Release Assets
325-
if: startsWith(github.ref, 'refs/tags/')
326-
uses: softprops/action-gh-release@v1
327-
with:
328-
prerelease: true
329-
files: ./build/packages/*
330-
env:
331-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
332-
333-
334166
# --------------------------
335167
# --- Windows MSVC steps ---
336168
# --------------------------
@@ -475,3 +307,175 @@ jobs:
475307
# env:
476308
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
477309

310+
311+
############################################
312+
# The macOS build is currently not working #
313+
############################################
314+
315+
# # -------------------------
316+
# # --- macOS amd64 steps ---
317+
# # -------------------------
318+
# #
319+
# macos-amd64:
320+
# runs-on: macos-13
321+
# steps:
322+
#
323+
# # --- Clone the latest commit ---
324+
# - name: Checkout
325+
# uses: actions/checkout@v3
326+
# with:
327+
# fetch-tags: true
328+
# submodules: recursive
329+
# fetch-depth: 0
330+
#
331+
# # --- Config git and get the version from "git describe" ---
332+
# - name: Config Git
333+
# id: config_git
334+
# shell: bash
335+
# run: |
336+
# git config user.email "Ho-Ro@users.noreply.github.com"
337+
# git config user.name "Ho-Ro"
338+
# git fetch --tags --force || true
339+
# git submodule update --init --recursive
340+
# echo "git_describe=$(git describe)"
341+
# echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
342+
#
343+
# - name: Install macOS intel Build Requirements
344+
# run: |
345+
# mkdir build
346+
# brew install qt@6 fftw binutils create-dmg || true
347+
#
348+
# - name: macOS intel Build
349+
# # GitHub hosts macOS runners in GitHub's own macOS Cloud:
350+
# # 4-core CPU, 14 GB of RAM memory, 14 GB of SSD disk space
351+
# working-directory: ${{github.workspace}}/build
352+
# run: |
353+
# cp ../CHANGELOG changelog
354+
# cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$(brew --prefix qt@6)
355+
# make -j16
356+
# sudo make -j16 package
357+
# if test -d openhantek/OpenHantek.app; then
358+
# export PATH=$(brew --prefix qt@6)/bin:${PATH}
359+
# cd openhantek
360+
# macdeployqt OpenHantek.app -always-overwrite -verbose=1
361+
# python ../../utils/macdeployqtfix/macdeployqtfix.py \
362+
# --quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt@6)
363+
# create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns \
364+
# --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
365+
# --skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \
366+
# --eula ../../LICENSE OpenHantek.dmg OpenHantek.app
367+
# cd ..
368+
# else
369+
# true
370+
# fi
371+
# if test -d openhantek/OpenHantek.app; then
372+
# cd openhantek
373+
# sudo tar -czf ../packages/openhantek_*_macos_*.tar.gz OpenHantek.app
374+
# if test -f OpenHantek.dmg; then
375+
# sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_macos_*.tar.gz .tar.gz).dmg
376+
# fi
377+
# cd ..
378+
# ls -l packages
379+
# else
380+
# true
381+
# fi
382+
#
383+
# - name: Upload macOS intel Artifacts
384+
# uses: actions/upload-artifact@v4
385+
# with:
386+
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_amd64
387+
# path: ${{github.workspace}}/build/packages/*
388+
#
389+
# - name: Upload macOS intel Release Assets
390+
# if: startsWith(github.ref, 'refs/tags/')
391+
# uses: softprops/action-gh-release@v1
392+
# with:
393+
# prerelease: true
394+
# files: ./build/packages/*
395+
# env:
396+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
397+
398+
399+
# # -------------------------
400+
# # --- macOS arm64 steps ---
401+
# # -------------------------
402+
# #
403+
# macos-arm64:
404+
# runs-on: macos-14
405+
# steps:
406+
#
407+
# # --- Clone the latest commit ---
408+
# - name: Checkout
409+
# uses: actions/checkout@v3
410+
# with:
411+
# fetch-tags: true
412+
# submodules: recursive
413+
# fetch-depth: 0
414+
#
415+
# # --- Config git and get the version from "git describe" ---
416+
# - name: Config Git
417+
# id: config_git
418+
# shell: bash
419+
# run: |
420+
# git config user.email "Ho-Ro@users.noreply.github.com"
421+
# git config user.name "Ho-Ro"
422+
# git fetch --tags --force || true
423+
# git submodule update --init --recursive
424+
# echo "git_describe=$(git describe)"
425+
# echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
426+
#
427+
# - name: Install macOS Build Requirements
428+
# run: |
429+
# mkdir build
430+
# brew install qt@6 fftw binutils create-dmg || true
431+
#
432+
# - name: macOS arm64 Build
433+
# # GitHub hosts macOS runners in GitHub's own macOS Cloud:
434+
# # 3-core M1 CPU, 14 GB of RAM memory, 7 GB of SSD disk space
435+
# working-directory: ${{github.workspace}}/build
436+
# run: |
437+
# cp ../CHANGELOG changelog
438+
# cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$(brew --prefix qt@6)
439+
# make -j12
440+
# sudo make -j12 package
441+
# if test -d openhantek/OpenHantek.app; then
442+
# export PATH=$(brew --prefix qt@6)/bin:${PATH}
443+
# cd openhantek
444+
# macdeployqt OpenHantek.app -always-overwrite -verbose=1
445+
# python ../../utils/macdeployqtfix/macdeployqtfix.py \
446+
# --quiet OpenHantek.app/Contents/MacOS/OpenHantek $(brew --prefix qt@6)
447+
# create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/OpenHantek.icns \
448+
# --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 \
449+
# --skip-jenkins --hide-extension "OpenHantek.app" --app-drop-link 600 185 \
450+
# --eula ../../LICENSE OpenHantek.dmg OpenHantek.app
451+
# cd ..
452+
# else
453+
# true
454+
# fi
455+
# if test -d openhantek/OpenHantek.app; then
456+
# cd openhantek
457+
# sudo tar -czf ../packages/openhantek_*_macos_*.tar.gz OpenHantek.app
458+
# if test -f OpenHantek.dmg; then
459+
# sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_macos_*.tar.gz .tar.gz).dmg
460+
# fi
461+
# cd ..
462+
# ls -l packages
463+
# else
464+
# true
465+
# fi
466+
#
467+
# - name: Upload macOS arm64 Artifacts
468+
# uses: actions/upload-artifact@v4
469+
# with:
470+
# name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_arm64
471+
# path: ${{github.workspace}}/build/packages/*
472+
#
473+
# - name: Upload macOS arm64 Release Assets
474+
# if: startsWith(github.ref, 'refs/tags/')
475+
# uses: softprops/action-gh-release@v1
476+
# with:
477+
# prerelease: true
478+
# files: ./build/packages/*
479+
# env:
480+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
481+

‎CHANGELOG‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2025-09-08 (b24c854): reorder GitHub runner script
2+
2025-09-08 (898f7d5): use the correct arm64 runner
3+
2025-09-08 (4ce0f0c): ad linux arm64 build
4+
2025-09-06 (16053ea): update build process for Qt6
5+
2025-09-05 (dfc4d4e): show Qt lib version, not Qt compile version; min CMake ver. 3.10 -> 3.12
16
2025-09-02 (68439b7): reorder logical functions; update translations
27
2025-06-22 (e15ed3a): Added XOR function to the MathChannel module.
38
2025-09-01 (ef3f244): Back to GO, disable MinGW build until a volunteer fixes it for Qt6

0 commit comments

Comments
 (0)