Update file paths for macOS and Windows workflows

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Feb 13, 2024 · fcf5ccb · fcf5ccb
1 parent a3dceda
commit fcf5ccb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           name: TTFviewer_macos
           path: |
-            ./build_release/out/TTFviewer.dmg
+            ./dmgOut/*.dmg
 
       - name: Run tests
         run: |
@@ -97,7 +97,7 @@ jobs:
         with:
           name: TTFviewer_macos_arm64
           path: |
-            ./build_release/out/TTFviewer.dmg
+            ./dmgOut/*.dmg
 
       - name: Run tests
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -72,7 +72,7 @@ jobs:
         with:
           name: TTFviewer_windows
           path: |
-            ./InnoSetup/TTFviewer_setup.exe
+            ./output/*.exe
 
       - name: Run tests
         run: |

diff --git a/build_dmg.sh b/build_dmg.sh
@@ -30,5 +30,14 @@ cd ./build_release/out
 $QT_DIR/bin/macdeployqt TTFviewer.app
 otool -L ./TTFviewer.app/Contents/MacOS/TTFviewer
 ./build-dmg.sh TTFviewer
+cd ../../
+mkdir dmgOut
+cpu=$(sysctl -n machdep.cpu.brand_string)
+ARCH="x86_64"
+case $cpu in
+  *Intel*) ARCH="x86_64" ;;
+  *Apple*) ARCH="arm64" ;;
+esac
+cp ./build_release/out/TTFviewer.dmg ./dmgOut/TTFviewer_macos_"$TTFVIEWER_VERSION"_"$ARCH".dmg
 echo build success!
 ###############################################################################
diff --git a/build_setup.bat b/build_setup.bat
@@ -44,5 +44,12 @@ xcopy /y "D:\freetype\bin\libfreetype-6.dll" ".\InnoSetup\build\"
 echo "wait inno build setup..."
 iscc /q ".\InnoSetup\build_temp_setup.iss"
 del .\InnoSetup\build_temp_setup.iss
+FOR /F "delims=. tokens=1-3" %%x IN ("%TTFVIEWER_VERSION%") DO (
+    set "TTFVIEWER_MAJARVERSION=%%x"
+    set "TTFVIEWER_SUBVERSION=%%y"
+    set "TTFVIEWER_REVISION=%%z"
+)
+mkdir ".\output"
+echo F|xcopy /S /Q /Y /F ".\InnoSetup\TTFviewer_setup.exe" ".\output\TTFviewer_windows_V%TTFVIEWER_MAJARVERSION%%TTFVIEWER_SUBVERSION%%TTFVIEWER_REVISION%_x86_64_setup.exe"
 echo "build success!"
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::