Skip to content

Commit 3f42320

Browse files
committed
finetuning the build process - no OH6022 changes
Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
1 parent b174c4c commit 3f42320

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/build.yml

+10-12
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
run: |
5555
git config user.email "Ho-Ro@users.noreply.github.com"
5656
git config user.name "Ho-Ro"
57-
git fetch --prune --tags || true
57+
git fetch --tags --force || true
5858
git submodule update --init --recursive
5959
echo "git_describe=$(git describe)"
6060
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
@@ -95,9 +95,9 @@ jobs:
9595
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9696

9797

98-
# -------------------
99-
# --- macOS steps ---
100-
# -------------------
98+
# -------------------------
99+
# --- macOS intel steps ---
100+
# -------------------------
101101
#
102102
macos-intel:
103103
runs-on: macos-13
@@ -118,7 +118,7 @@ jobs:
118118
run: |
119119
git config user.email "Ho-Ro@users.noreply.github.com"
120120
git config user.name "Ho-Ro"
121-
git fetch --prune --tags || true
121+
git fetch --tags --force || true
122122
git submodule update --init --recursive
123123
echo "git_describe=$(git describe)"
124124
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
@@ -153,7 +153,6 @@ jobs:
153153
fi
154154
if test -d openhantek/OpenHantek.app; then
155155
cd openhantek
156-
ls -l
157156
sudo tar -czf ../packages/openhantek_*_osx_*.tar.gz OpenHantek.app
158157
if test -f OpenHantek.dmg; then
159158
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg
@@ -180,9 +179,9 @@ jobs:
180179
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
181180

182181

183-
# -------------------
182+
# -------------------------
184183
# --- macOS arm64 steps ---
185-
# -------------------
184+
# -------------------------
186185
#
187186
macos-arm64:
188187
runs-on: macos-14
@@ -203,7 +202,7 @@ jobs:
203202
run: |
204203
git config user.email "Ho-Ro@users.noreply.github.com"
205204
git config user.name "Ho-Ro"
206-
git fetch --prune --tags || true
205+
git fetch --tags --force || true
207206
git submodule update --init --recursive
208207
echo "git_describe=$(git describe)"
209208
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
@@ -238,7 +237,6 @@ jobs:
238237
fi
239238
if test -d openhantek/OpenHantek.app; then
240239
cd openhantek
241-
ls -l
242240
sudo tar -czf ../packages/openhantek_*_osx_*.tar.gz OpenHantek.app
243241
if test -f OpenHantek.dmg; then
244242
sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg
@@ -288,7 +286,7 @@ jobs:
288286
run: |
289287
git config user.email "Ho-Ro@users.noreply.github.com"
290288
git config user.name "Ho-Ro"
291-
git fetch --prune --tags || true
289+
git fetch --tags --force || true
292290
git submodule update --init --recursive
293291
echo "git_describe=$(git describe)"
294292
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
@@ -362,7 +360,7 @@ jobs:
362360
run: |
363361
git config user.email "Ho-Ro@users.noreply.github.com"
364362
git config user.name "Ho-Ro"
365-
git fetch --prune --tags || true
363+
git fetch --tags --force || true
366364
git submodule update --init --recursive
367365
echo "git_describe=$(git describe)"
368366
echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT

CHANGELOG

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
2025-03-03 (b174c4c): test for macos intel and arm64 build
12
2025-03-03 (d3c654e): test for macos build
23
2025-03-03 (ff8afbc): test for macos build
34
2025-03-03 (3cf168f): test for macos arm64 build

0 commit comments

Comments
 (0)