Create icon before build on Mac

slist · Jun 19, 2023 · d189635 · d189635
1 parent f1dc0c2
commit d189635
Show file tree

Hide file tree

Showing 12 changed files with 2,006 additions and 25 deletions.
diff --git a/.github/workflows/linux_qt5_release.yml b/.github/workflows/linux_qt5_release.yml
@@ -29,11 +29,6 @@ jobs:
         with:
           submodules: recursive
 
-            #      - name: Install dependencies
-            #        run: |
-            #          sudo apt-get update
-            #          sudo apt-get install -y qt5-default
-
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:

diff --git a/.github/workflows/linux_qt6_release.yml b/.github/workflows/linux_qt6_release.yml
@@ -29,11 +29,6 @@ jobs:
         with:
           submodules: recursive
 
-            #      - name: Install dependencies
-            #        run: |
-            #          sudo apt-get update
-            #          sudo apt-get install -y qt5-default
-
       - name: Install Qt
         uses: jurplel/[email protected]
         with:

diff --git a/.github/workflows/mac_qt6_release.yml b/.github/workflows/mac_qt6_release.yml
@@ -39,12 +39,6 @@ jobs:
       - name: Create build directory
         run:  mkdir ${{ env.SOURCE_DIR }}/build
 
-      - name: Build
-        working-directory: ${{ env.SOURCE_DIR }}/build
-        run:  |
-              qmake -r ${{ env.SOURCE_DIR }}/cbapi-qt-demo.pro -config release
-              make -j 3
-
       - name: Create icons for MacOS
         working-directory: ${{ env.SOURCE_DIR }}
         run:  |
@@ -68,14 +62,19 @@ jobs:
               echo -e "\n---\nls *.icns\n---\n"
               ls *.icns
 
+      - name: Build
+        working-directory: ${{ env.SOURCE_DIR }}/build
+        run:  |
+              qmake -r ${{ env.SOURCE_DIR }}/cbapi-qt-demo.pro -config release
+              make -j 3
+      
       - name: Create DMG Package
         working-directory: ${{ env.SOURCE_DIR }}/build
         run:  |
               macdeployqt cbapi-qt-demo.app -dmg
               echo -e "\n---\nls *.dmg\n---\n"
               ls *.dmg
 
-
       - name: Save build artifact
         uses: actions/upload-artifact@master
         with:

diff --git a/.github/workflows/windows_qt5_release.yml b/.github/workflows/windows_qt5_release.yml
@@ -35,14 +35,6 @@ jobs:
           git fetch --all --tags -f
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
-          #        with:
-          #          version:      ${{ env.QT_VERSION }}
-          #          host:         windows
-          #          target:       desktop
-          #          arch:         win64_msvc2019_64
-          #          dir:          ${{ runner.temp }}
-          #          modules:      qtcharts qt3d
-          #          setup-python: false
 
       - name: Download JOM
         uses: suisei-cn/[email protected]