edit tasks

e2se · Feb 7, 2024 · c63dea6 · c63dea6
1 parent cb60919
commit c63dea6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/build-linux-appimage.yml b/.github/workflows/build-linux-appimage.yml
@@ -37,6 +37,9 @@ jobs:
         chmod +x linuxdeploy-x86_64.AppImage
         chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
         chmod +x appimagetool-x86_64.AppImage
+        mv linuxdeploy-x86_64.AppImage /usr/local/bin/linuxdeploy
+        mv linuxdeploy-plugin-qt-x86_64.AppImage /usr/local/bin/linuxdeploy-plugin-qt
+        mv appimagetool-x86_64.AppImage /usr/local/bin/appimagetool
 
     - name: Configure CMake
       working-directory: ${{github.workspace}}/e2-sat-editor/src

diff --git a/.github/workflows/build-macos-intel.yml b/.github/workflows/build-macos-intel.yml
@@ -57,11 +57,11 @@ jobs:
         DESTDIR=../AppDir ninja -C build install
         cp ../dist/macos/PkgInfo.in AppDir/usr/local/e2\ SAT\ Editor.app/Contents/PkgInfo
         # copy translations
-        QMDIR="AppDir/Program Files (x86)/e2-sat-editor/bin/translations"
+        QMDIR=AppDir/usr/local/e2\ SAT\ Editor.app/Contents/Resources/translations
         mkdir -p "$QMDIR"
         cp ../dist/translations/*.qm "$QMDIR"
-        cp /mingw64/lib/qt6/translations/qt_*.qm "$QMDIR"
-        cp /mingw64/lib/qt6/translations/qtbase_*.qm "$QMDIR"
+        cp /usr/local/opt/qt/share/qt/translations/qt_*.qm "$QMDIR"
+        cp /usr/local/opt/qt/share/qt/translations/qtbase_*.qm "$QMDIR"
         rm -R "$QMDIR"/qt_help_*.qm
         # run deploy script
         bash ../scripts/deployqtmacx.sh AppDir/usr/local/e2\ SAT\ Editor.app
@@ -74,7 +74,7 @@ jobs:
         cp COPYING ../artifact/License.txt
         mv AppDir/usr/local/e2\ SAT\ Editor.app ../artifact/
         mv AppDir/usr/local/e2se-cli ../artifact/cli/
-        mv ${{github.workspace}}/user-manual ../artifact/
+        mv "${{github.workspace}}/user-manual" ../artifact/
 
     # - name: Test
     #   working-directory: ${{github.workspace}}/e2-sat-editor/artifact

diff --git a/.github/workflows/build-macos-silicon.yml b/.github/workflows/build-macos-silicon.yml
@@ -74,7 +74,7 @@ jobs:
         cp COPYING ../artifact/License.txt
         mv AppDir/usr/local/e2\ SAT\ Editor.app ../artifact/
         mv AppDir/usr/local/e2se-cli ../artifact/cli/
-        mv ${{github.workspace}}/user-manual ../artifact/
+        mv "${{github.workspace}}/user-manual" ../artifact/
 
     # - name: Test
     #   working-directory: ${{github.workspace}}/e2-sat-editor/artifact

diff --git a/.github/workflows/build-win32.yml b/.github/workflows/build-win32.yml
@@ -88,17 +88,18 @@ jobs:
         -qt-version 5 \
         -modules Core,Gui,Widgets,PrintSupport \
         -plugins platforms,styles,printsupport \
-        -libraries libcurl-4.dll,libcrypto-3.dll,libidn2-0.dll,libnghttp2-14.dll,libpsl-5.dll,libssh2.dll,libssl-3.dll,libunistring-5.dll
+        -libraries libcurl-4.dll,libcrypto-3.dll,libidn2-0.dll,libnghttp2-14.dll,libpsl-5.dll,libssh2-1.dll,libssl-3.dll,libunistring-5.dll
         # post actions
         rm "AppDir/Program Files (x86)/e2-sat-editor/bin/platforms/qdirect2d.dll"
         # package
         mkdir -p ../artifact/{cli,user-manual}
         cp ../dist/common/Readme.txt.in ../artifact/Readme.txt
         cp COPYING ../artifact/License.txt
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"*.dll ../artifact/
-        mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"{platforms,styles,printsupport} ../artifact/
+        mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"{platforms,styles,printsupport,translations} ../artifact/
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/e2-sat-editor.exe" ../artifact/
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/e2se-cli.exe" ../artifact/cli/
+        cp ../artifact/{libgcc_s_dw2-1,libstdc++-6,libwinpthread-1}.dll ../artifact/cli/
         mv "${{github.workspace}}/user-manual" ../artifact/
 
     # - name: Test

diff --git a/.github/workflows/build-win64.yml b/.github/workflows/build-win64.yml
@@ -83,17 +83,18 @@ jobs:
         bash ../scripts/deployqtwin.sh "AppDir/Program Files (x86)/e2-sat-editor/bin/e2-sat-editor.exe" \
         --verbose \
         -modules Core,Gui,Widgets,PrintSupport \
-        -libraries libcurl-4.dll,libcrypto-3-x64.dll,libidn2-0.dll,libnghttp2-14.dll,libpsl-5.dll,libssh2.dll,libssl-3-x64.dll,libunistring-5.dll
+        -libraries libcurl-4.dll,libcrypto-3-x64.dll,libidn2-0.dll,libnghttp2-14.dll,libpsl-5.dll,libssh2-1.dll,libssl-3-x64.dll,libunistring-5.dll
         # post actions
         rm "AppDir/Program Files (x86)/e2-sat-editor/bin/platforms/qdirect2d.dll"
         # package
         mkdir -p ../artifact/{cli,user-manual}
         cp ../dist/common/Readme.txt.in ../artifact/Readme.txt
         cp COPYING ../artifact/License.txt
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"*.dll ../artifact/
-        mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"{platforms,styles} ../artifact/
+        mv "AppDir/Program Files (x86)/e2-sat-editor/bin/"{platforms,styles,translations} ../artifact/
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/e2-sat-editor.exe" ../artifact/
         mv "AppDir/Program Files (x86)/e2-sat-editor/bin/e2se-cli.exe" ../artifact/cli/
+        cp ../artifact/{libgcc_s_seh-1,libstdc++-6,libwinpthread-1}.dll ../artifact/cli/
         mv "${{github.workspace}}/user-manual" ../artifact/
 
     # - name: Test