Skip to content

Commit e5aec49

Browse files
committed
ci: try fixing AppImage + see if install-qt-action is fixed on Windows
1 parent 82363f7 commit e5aec49

2 files changed

Lines changed: 21 additions & 18 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ jobs:
7979
dir: '/'
8080
setup-python: false
8181

82-
- name: Fix env vars if needed
83-
uses: actions/github-script@v7
84-
with:
85-
script: |
86-
if (process.env.QT_ROOT_DIR) {
87-
core.exportVariable('QT_ROOT_DIR', process.env.QT_ROOT_DIR.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
88-
core.exportVariable('Qt6_DIR', process.env.QT_ROOT_DIR + "/lib/cmake/Qt6");
89-
core.addPath(process.env.QT_ROOT_DIR + "/bin");
90-
}
91-
if (process.env.QT_PLUGIN_PATH)
92-
core.exportVariable('QT_PLUGIN_PATH', process.env.QT_PLUGIN_PATH.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
93-
if (process.env.QML2_IMPORT_PATH)
94-
core.exportVariable('QML2_IMPORT_PATH', process.env.QML2_IMPORT_PATH.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
82+
#- name: Fix env vars if needed
83+
# uses: actions/github-script@v7
84+
# with:
85+
# script: |
86+
# if (process.env.QT_ROOT_DIR) {
87+
# core.exportVariable('QT_ROOT_DIR', process.env.QT_ROOT_DIR.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
88+
# core.exportVariable('Qt6_DIR', process.env.QT_ROOT_DIR + "/lib/cmake/Qt6");
89+
# core.addPath(process.env.QT_ROOT_DIR + "/bin");
90+
# }
91+
# if (process.env.QT_PLUGIN_PATH)
92+
# core.exportVariable('QT_PLUGIN_PATH', process.env.QT_PLUGIN_PATH.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
93+
# if (process.env.QML2_IMPORT_PATH)
94+
# core.exportVariable('QML2_IMPORT_PATH', process.env.QML2_IMPORT_PATH.replace(/[/\\]bin[/\\]qmake[^/\\]*/i, ""));
9595

9696
- name: Configure CMake
9797
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -125,3 +125,4 @@ jobs:
125125
path: |
126126
build/package/
127127
build/*.7z
128+
build/*.AppImage

ci/pack.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,19 @@ Push-Location ./package
7474

7575
if ($isLinux) {
7676
# retrieve deployment tool
77-
wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
78-
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
77+
wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
78+
wget -c "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
79+
chmod a+x linuxdeploy-x86_64.AppImage
80+
chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
7981

8082
$env:VERSION = $versionStr;
81-
./linuxdeployqt-continuous-x86_64.AppImage ./uc2 -bundle-non-qt-libs "-extra-plugins=iconengines,platformthemes,styles" -appimage
83+
./linuxdeploy-x86_64.AppImage --appdir=./ --desktop-file=UnCSO2.desktop --icon-file=UnCSO2.png --plugin qt --output appimage
8284

8385
if ($isGccBuild) {
84-
Move-Item *.AppImage -Destination "UnCSO2-$versionStr-linux64_gcc.AppImage"
86+
Move-Item *.AppImage -Destination "../UnCSO2-$versionStr-linux64_gcc.AppImage"
8587
}
8688
elseif ($isClangBuild) {
87-
Move-Item *.AppImage -Destination "UnCSO2-$versionStr-linux64_clang.AppImage"
89+
Move-Item *.AppImage -Destination "../UnCSO2-$versionStr-linux64_clang.AppImage"
8890
}
8991

9092
Pop-Location

0 commit comments

Comments
 (0)