diff -Nru nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/admin/linux/build-appimage.sh nextcloud-desktop-3.6.0-20220901.180208.51c46402f/admin/linux/build-appimage.sh --- nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/admin/linux/build-appimage.sh 2022-09-01 04:30:18.000000000 +0000 +++ nextcloud-desktop-3.6.0-20220901.180208.51c46402f/admin/linux/build-appimage.sh 2022-09-01 18:00:48.000000000 +0000 @@ -8,12 +8,10 @@ export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user} #Set Qt-5.15 -export QT_BASE_DIR=/opt/qt5.15 +export QT_BASE_DIR=/opt/kdeqt5.15 export QTDIR=$QT_BASE_DIR export PATH=$QT_BASE_DIR/bin:$PATH -export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH -export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH # Set defaults export SUFFIX=${DRONE_PULL_REQUEST:=master} @@ -26,17 +24,6 @@ mkdir /app -# QtKeyChain -git clone https://github.com/frankosterfeld/qtkeychain.git -cd qtkeychain -git checkout v0.10.0 -mkdir build -cd build -cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/usr .. -cmake --build . --target all -DESTDIR=/app cmake --install . - - # Build client mkdir build-client cd build-client @@ -60,7 +47,6 @@ mv usr/lib/*sync_vfs_suffix.so usr/plugins mv usr/lib/*sync_vfs_xattr.so usr/plugins - rm -rf usr/lib/cmake rm -rf usr/include rm -rf usr/mkspecs @@ -80,7 +66,6 @@ sed -i -e 's|Icon=nextcloud|Icon=Nextcloud|g' ${DESKTOP_FILE} # Bug in desktop file? cp ./usr/share/icons/hicolor/512x512/apps/*.png . # Workaround for linuxeployqt bug, FIXME - # Because distros need to get their shit together cp -R /usr/lib/x86_64-linux-gnu/libssl.so* ./usr/lib/ cp -R /usr/lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/ @@ -98,7 +83,7 @@ rm ./linuxdeployqt.AppImage cp -r ./squashfs-root ./linuxdeployqt-squashfs-root unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/usr/lib/ +export LD_LIBRARY_PATH=/usr/local/lib/x86_64-linux-gnu ./squashfs-root/AppRun ${DESKTOP_FILE} -bundle-non-qt-libs -qmldir=${DESKTOP_CLIENT_ROOT}/src/gui # Set origin diff -Nru nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/debian/changelog nextcloud-desktop-3.6.0-20220901.180208.51c46402f/debian/changelog --- nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/debian/changelog 2022-09-01 04:32:08.000000000 +0000 +++ nextcloud-desktop-3.6.0-20220901.180208.51c46402f/debian/changelog 2022-09-01 18:02:18.000000000 +0000 @@ -1,8 +1,26 @@ -nextcloud-desktop (3.6.0-20220901.043202.d6a48d3cf-1.0~focal1) focal; urgency=medium +nextcloud-desktop (3.6.0-20220901.180208.51c46402f-1.0~focal1) focal; urgency=medium - * Merge commit 'd6a48d3cf17f53e0d096ce169a36e99bc8fcb5e8' into HEAD + * Merge commit '51c46402f5da370fff9966ffaae87aa26669dbda' into HEAD - -- Nextcloud bot Thu, 1 Sep 2022 04:32:08 +0000 + -- Matthieu Gallien Thu, 1 Sep 2022 18:02:18 +0000 + +nextcloud-desktop (3.5.82-20220901.153912.51c46402f-1.0~focal1) focal; urgency=medium + + * Merge pull request #4882 from nextcloud/ci/updateBuildAppImageScript + + -- Matthieu Gallien Thu, 1 Sep 2022 17:39:12 +0200 + +nextcloud-desktop (3.5.82-20220901.075022.b245c3d76-1.0~focal1) focal; urgency=medium + + * use the new CI images + + -- Matthieu Gallien Thu, 1 Sep 2022 09:50:22 +0200 + +nextcloud-desktop (3.5.82-20220901.073449.28b50f3fe-1.0~focal1) focal; urgency=medium + + * do not build qt keychain already included in the CI images + + -- Matthieu Gallien Thu, 1 Sep 2022 09:34:49 +0200 nextcloud-desktop (3.5.82-20220901.042729.d6a48d3cf-1.0~focal1) focal; urgency=medium diff -Nru nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/.drone.yml nextcloud-desktop-3.6.0-20220901.180208.51c46402f/.drone.yml --- nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/.drone.yml 2022-09-01 04:30:18.000000000 +0000 +++ nextcloud-desktop-3.6.0-20220901.180208.51c46402f/.drone.yml 2022-09-01 18:00:48.000000000 +0000 @@ -3,7 +3,7 @@ steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -11,7 +11,7 @@ - cd /drone/build - cmake -G Ninja -DCMAKE_C_COMPILER=gcc-11 -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src - name: compile - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -19,7 +19,7 @@ - cd /drone/build - ninja - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -47,7 +47,7 @@ steps: - name: cmake - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -55,7 +55,7 @@ - cd /drone/build - cmake -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang-14 -DCMAKE_CXX_COMPILER=clang++-14 -DCMAKE_BUILD_TYPE=Debug -DQUICK_COMPILER=ON -DBUILD_UPDATER=ON -DBUILD_TESTING=1 -DECM_ENABLE_SANITIZERS=address -DCMAKE_CXX_FLAGS=-Werror -DOPENSSL_ROOT_DIR=/usr/local/lib64 ../src - name: compile - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -63,7 +63,7 @@ - cd /drone/build - ninja - name: test - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -73,7 +73,7 @@ - chown -R test:test . - su -c 'ASAN_OPTIONS=detect_leaks=0 xvfb-run ctest --output-on-failure' test - name: clang-tidy - image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + image: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 volumes: - name: build path: /drone/build @@ -98,7 +98,7 @@ steps: - name: build - image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-4 + image: ghcr.io/nextcloud/continuous-integration-client-appimage:client-appimage-5 environment: CI_UPLOAD_GIT_TOKEN: from_secret: CI_UPLOAD_GIT_TOKEN diff -Nru nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/.github/workflows/sonarcloud.yml nextcloud-desktop-3.6.0-20220901.180208.51c46402f/.github/workflows/sonarcloud.yml --- nextcloud-desktop-3.6.0-20220901.043202.d6a48d3cf/.github/workflows/sonarcloud.yml 2022-09-01 04:30:18.000000000 +0000 +++ nextcloud-desktop-3.6.0-20220901.180208.51c46402f/.github/workflows/sonarcloud.yml 2022-09-01 18:00:48.000000000 +0000 @@ -9,7 +9,7 @@ build: name: Build runs-on: ubuntu-latest - container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-8 + container: ghcr.io/nextcloud/continuous-integration-client:client-5.15-9 env: SONAR_SERVER_URL: "https://sonarcloud.io" BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed