Work on CI builds

emericg · Sep 21, 2023 · 1c738ef · 1c738ef
1 parent 65b33c4
commit 1c738ef
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/builds_minianalyser.yml b/.github/workflows/builds_minianalyser.yml
@@ -13,8 +13,7 @@ on:
 #--------------------------------------------------------------------------------
 
 env:
-  APP_NAME: "MiniAnalyser"
-  APP_EXECUTABLE: "mini_analyser"
+  APP_NAME: "mini_analyser"
   APP_VERSION: "48"
   QT_VERSION: "6.5.2"
 
@@ -60,7 +59,7 @@ jobs:
         run: |
              cd mini_analyser/
              qmake --version
-             qmake ${{env.APP_EXECUTABLE}}.pro CONFIG+=release PREFIX=/usr
+             qmake ${{env.APP_NAME}}.pro CONFIG+=release PREFIX=/usr
              make -j$(nproc)
 
       # Package application
@@ -76,13 +75,14 @@ jobs:
              chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
              export EXTRA_QT_PLUGINS="svg"
              ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin qt --output appimage
+             mv ${{env.APP_NAME}}-x86_64.AppImage ../${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
 
       # Upload AppImage
       - name: Upload AppImage
         uses: actions/upload-artifact@v3
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
-          path: mini_analyser/${{env.APP_EXECUTABLE}}*.AppImage
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-linux64.AppImage
 
   ## macOS build ###############################################################
   build-mac:
@@ -119,22 +119,22 @@ jobs:
         run: |
              cd mini_analyser/
              qmake --version
-             qmake ${{env.APP_EXECUTABLE}}.pro CONFIG+=release
+             qmake ${{env.APP_NAME}}.pro CONFIG+=release
              make -j$(nproc)
 
       # Package application
       - name: Package application
         run: |
              cd mini_analyser/
              make install
-             zip -r -X ../../${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip bin/${{env.APP_EXECUTABLE}}.app
+             zip -r -X ../../${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip bin/${{env.APP_NAME}}.app
 
-      # Upload app bundle
+      # Upload app zip
       - name: Upload app zip
         uses: actions/upload-artifact@v3
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS
-          path: mini_analyser/bin/${{env.APP_EXECUTABLE}}.app
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}-macOS.zip
 
   ## Windows build #############################################################
   build-windows:
@@ -180,23 +180,23 @@ jobs:
         run: |
              cp minivideo/build/Release/minivideo.lib mini_analyser/build/minivideo.lib
              cp minivideo/build/Release/minivideo.dll mini_analyser/build/minivideo.dll
+             cp minivideo/build/Release/minivideo.lib mini_analyser/bin/minivideo.lib
+             cp minivideo/build/Release/minivideo.dll mini_analyser/bin/minivideo.dll
              cd mini_analyser/
              qmake --version
-             qmake ${{env.APP_EXECUTABLE}}.pro CONFIG+=release
+             qmake ${{env.APP_NAME}}.pro CONFIG+=release
              nmake
 
       # Package application
       - name: Package application
         run: |
-             cp minivideo/build/Release/minivideo.lib mini_analyser/bin/minivideo.lib
-             cp minivideo/build/Release/minivideo.dll mini_analyser/bin/minivideo.dll
              windeployqt mini_analyser/bin/
-             mv mini_analyser/bin mini_analyser/${{env.APP_EXECUTABLE}}-${{env.APP_VERSION}}-win64
-             7z a mini_analyser/${{env.APP_EXECUTABLE}}-${{env.APP_VERSION}}-win64.zip ${{env.APP_EXECUTABLE}}-${{env.APP_VERSION}}-win64
+             mv mini_analyser/bin mini_analyser/${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
+             7z a ../${{env.APP_NAME}}-${{env.APP_VERSION}}-win64.zip ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
 
       # Upload app zip
       - name: Upload app zip
         uses: actions/upload-artifact@v3
         with:
           name: ${{env.APP_NAME}}-${{env.APP_VERSION}}-win64
-          path: ${{env.APP_EXECUTABLE}}-${{env.APP_VERSION}}.zip
+          path: ${{env.APP_NAME}}-${{env.APP_VERSION}}.zip