Skip to content

Commit c304305

Browse files
committed
fix(ci): use scantailor-advanced binary in release packaging
The v1.2.0 rename left AppImage/linuxdeploy and dpkg-shlibdeps pointing at the old executable name, which broke the Release workflow AppImage job.
1 parent fc165ca commit c304305

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
cd build-appimage
8383
export QMAKE=/usr/bin/qmake
8484
# Bundle Qt platform plugins (e.g. xcb) via linuxdeploy-plugin-qt; same-dir discovery.
85-
../linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt -e AppDir/usr/bin/scantailor --output appimage
85+
../linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt -e AppDir/usr/bin/scantailor-advanced --output appimage
8686
OUT=$(ls -1 *.AppImage 2>/dev/null | head -1)
8787
mv "$OUT" "../scantailor-advanced-${{ github.ref_name }}-x86_64.AppImage"
8888

build-deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ARCH=$(dpkg --print-architecture 2>/dev/null || echo "amd64")
4040
# Generate Depends via dpkg-shlibdeps when available (more accurate)
4141
DEPS=""
4242
if command -v dpkg-shlibdeps >/dev/null 2>&1; then
43-
SHLIBS_OUT=$(cd "${PKG_DIR}" && dpkg-shlibdeps -e usr/bin/scantailor -O 2>/dev/null || true)
43+
SHLIBS_OUT=$(cd "${PKG_DIR}" && dpkg-shlibdeps -e usr/bin/scantailor-advanced -O 2>/dev/null || true)
4444
if [[ -n "$SHLIBS_OUT" ]]; then
4545
DEPS="${SHLIBS_OUT#shlibs:Depends=}"
4646
fi

build-windows.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# ./build-windows.sh # uses MXE_DIR or ~/mxe or /opt/mxe
1414
# ./build-windows.sh shared # use .shared target (exe + DLLs)
1515
#
16-
# Output: build-win-static/scantailor.exe (default), or build-win-shared/ for shared (exe + DLLs)
16+
# Output: build-win-static/scantailor-advanced.exe (default), or build-win-shared/ for shared (exe + DLLs)
1717

1818
set -e
1919

@@ -67,16 +67,20 @@ cmake -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN_FILE}" \
6767

6868
make -j"$(nproc)"
6969

70-
if [[ -f scantailor.exe ]]; then
70+
if [[ -f scantailor-advanced.exe ]]; then
71+
EXE_PATH="scantailor-advanced.exe"
72+
elif [[ -f release/scantailor-advanced.exe ]]; then
73+
EXE_PATH="release/scantailor-advanced.exe"
74+
elif [[ -f scantailor.exe ]]; then
7175
EXE_PATH="scantailor.exe"
7276
elif [[ -f release/scantailor.exe ]]; then
7377
EXE_PATH="release/scantailor.exe"
7478
else
75-
EXE_PATH=$(find . -name "scantailor.exe" -type f 2>/dev/null | head -1)
79+
EXE_PATH=$(find . -name "scantailor-advanced.exe" -o -name "scantailor.exe" -type f 2>/dev/null | head -1)
7680
fi
7781

7882
if [[ -z "$EXE_PATH" || ! -f "$EXE_PATH" ]]; then
79-
echo "Error: scantailor.exe not found in $BUILD_DIR" >&2
83+
echo "Error: scantailor-advanced.exe not found in $BUILD_DIR" >&2
8084
exit 1
8185
fi
8286

0 commit comments

Comments
 (0)