Skip to content

Commit 13c94af

Browse files
fix(ci): unstick unit-tests apt + hide Help menu when updater off
Drop libretro-beetle-psx from the headless apt step (core comes from install-ps1-libretro-core.sh) and cap apt install at 10 minutes. Remove Help > Check for Updates from package builds compiled without the updater. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 48af6d3 commit 13c94af

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -991,10 +991,13 @@ jobs:
991991
DEBIAN_FRONTEND: noninteractive
992992
run: |
993993
sudo apt-get update
994-
sudo apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold \
994+
# libretro PSX core is installed later via install-ps1-libretro-core.sh
995+
# (buildbot download). Dropping libretro-beetle-psx here avoids apt
996+
# stalls that have consumed the whole job timeout on GitHub runners.
997+
timeout 600 sudo apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold \
995998
libxcb-cursor0 libxcb-xinerama0 libx11-dev xvfb \
996999
mesa-utils libgl1-mesa-dri libegl-mesa0 libgbm1 libglx-mesa0 \
997-
libsecret-1-dev libretro-beetle-psx libsodium-dev
1000+
libsecret-1-dev libsodium-dev
9981001
# Start Xvfb with GLX support for Ogre GL initialization
9991002
Xvfb :99 -screen 0 1024x768x24 +extension GLX > /dev/null 2>&1 &
10001003
sleep 3

docs/AUTO_UPDATER_DESIGN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Only **`Portable`** enables download/install. All others show `updateCommandHint
102102
| **Portable** | macOS: `/Applications/QtMeshEditor.app`; Linux: `/opt/QtMeshEditor/`; Windows: zip layout / MSI registry `QtMeshEditor` without WinGet key. |
103103
| **Unknown** | CI trees, dev `build_local/`, ambiguous paths — **no self-update** (fail closed). |
104104

105-
`ENABLE_AUTO_UPDATER=OFF` for snap/flatpak/deb/docker CI builds (#439) so the code path is absent in those artifacts. **Wired:** `build-linux` passes `-DENABLE_AUTO_UPDATER=OFF` when producing `qtmesheditor_amd64.deb` (snap + Docker consume the same package).
105+
`ENABLE_AUTO_UPDATER=OFF` for snap/flatpak/deb/docker CI builds (#439) so the code path is absent in those artifacts. **Wired:** `build-linux` passes `-DENABLE_AUTO_UPDATER=OFF` when producing `qtmesheditor_amd64.deb` (snap + Docker consume the same package). Package builds also remove **Help → Check for Updates** from the menu at runtime.
106106

107107
### PoC status
108108

src/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,7 @@ void MainWindow::initToolBar()
22582258
#ifdef ENABLE_AUTO_UPDATER
22592259
ui->actionVerify_Update->setText(tr("Check for Updates..."));
22602260
#else
2261-
ui->actionVerify_Update->setVisible(false);
2261+
ui->menuHelp->removeAction(ui->actionVerify_Update);
22622262
#endif
22632263

22642264
// Keyboard Shortcuts reference in Help menu

0 commit comments

Comments
 (0)