From dd412793318e903a96dada3c7d5e9f04aa1f495d Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 15 May 2024 17:21:48 +0200 Subject: [PATCH] produce Appimage packages from github actions Signed-off-by: Matthieu Gallien --- .github/workflows/linux-appimage.yml | 17 +++++++++++++++++ src/common/syncjournaldb.cpp | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/linux-appimage.yml diff --git a/.github/workflows/linux-appimage.yml b/.github/workflows/linux-appimage.yml new file mode 100644 index 0000000000000..7e908ee73619f --- /dev/null +++ b/.github/workflows/linux-appimage.yml @@ -0,0 +1,17 @@ +name: Linux Appimage Package +on: + pull_request: + types: [opened, synchronize, reopened] +jobs: + build: + name: Linux Appimage Package + runs-on: ubuntu-latest + container: ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.6.3-2 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 1 + - name: Configure, compile and package + run: | + BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} BUILD_UPDATER=ON DESKTOP_CLIENT_ROOT=`pwd` EXECUTABLE_NAME=nextcloud QT_BASE_DIR=/opt/qt6.6.3 OPENSSL_ROOT_DIR=/usr/local/lib64 /bin/bash -c "./admin/linux/build-appimage.sh" + BUILDNR=${GITHUB_RUN_ID} VERSION_SUFFIX=${GITHUB_HEAD_REF} DESKTOP_CLIENT_ROOT=`pwd` /bin/bash -c "./admin/linux/upload-appimage.sh" || echo "Upload failed, however this is an optional step." diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index 895ad115c4d81..693066f2690df 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -586,7 +586,7 @@ bool SyncJournalDb::checkConnect() createQuery.bindValue(1, MIRALL_VERSION_MAJOR); createQuery.bindValue(2, MIRALL_VERSION_MINOR); createQuery.bindValue(3, MIRALL_VERSION_PATCH); - createQuery.bindValue(4, MIRALL_VERSION_BUILD); + createQuery.bindValue(4, static_cast(MIRALL_VERSION_BUILD)); if (!createQuery.exec()) { return sqlFail(QStringLiteral("Update version"), createQuery); } @@ -616,7 +616,7 @@ bool SyncJournalDb::checkConnect() createQuery.bindValue(1, MIRALL_VERSION_MAJOR); createQuery.bindValue(2, MIRALL_VERSION_MINOR); createQuery.bindValue(3, MIRALL_VERSION_PATCH); - createQuery.bindValue(4, MIRALL_VERSION_BUILD); + createQuery.bindValue(4, static_cast(MIRALL_VERSION_BUILD)); createQuery.bindValue(5, major); createQuery.bindValue(6, minor); createQuery.bindValue(7, patch);