Skip to content

chore: upgrade dependencies for desktop files client stable-4.0 #969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgallien wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

chore: upgrade dependencies for desktop files client stable-4.0 #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM almalinux/8-base

MAINTAINER Desktop Team <desktop@nextcloud.com>

Check warning on line 3 in client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8

View workflow job for this annotation

GitHub Actions / Push Docker image client-appimage-qt6:client-appimage-el8-6.9.3-5 to GitHub Packages

The MAINTAINER instruction is deprecated, use a label instead to define an image author 

MaintainerDeprecated: Maintainer instruction is deprecated in favor of using label
More info: https://docs.docker.com/go/dockerfile/rule/maintainer-deprecated/

# Run 'docker build' with '--build-arg BUILD_QT=1' to build Qt from source (default: not set)
ARG BUILD_QT
Expand Down Expand Up @@ -130,7 +130,7 @@

ADD craftmaster.qt-6.9.3.ini /root/craftmaster.ini

ENV CRAFT_IMAGE "linux-gcc-x86_64-qt6.9.3-13012026.tar.gz"

Check warning on line 133 in client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8

View workflow job for this annotation

GitHub Actions / Push Docker image client-appimage-qt6:client-appimage-el8-6.9.3-5 to GitHub Packages

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

RUN \
wget https://download.nextcloud.com/desktop/development/qt/${CRAFT_IMAGE} && \
Expand All @@ -144,12 +144,13 @@
git remote set-url origin https://github.com/nextcloud/craft.git \
;

ENV PATH "$PATH:/root/linux-gcc-x86_64/dev-utils/bin"

Check warning on line 147 in client-appimage-qt6/Dockerfile.build.qt-6.9.3.el8

View workflow job for this annotation

GitHub Actions / Push Docker image client-appimage-qt6:client-appimage-el8-6.9.3-5 to GitHub Packages

Legacy key/value format with whitespace separator should not be used 

LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format
More info: https://docs.docker.com/go/dockerfile/rule/legacy-key-value-format/

# Install binary dependencies
RUN \
rm -r /root/linux-gcc-x86_64/etc/blueprints/locations/desktop-client-blueprints && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-kde.git|stable-4.0|" && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/desktop-client-blueprints.git|stable-4.0|" && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --add-blueprint-repository "https://github.com/nextcloud/craft-blueprints-nextcloud.git|stable-4.0|" && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c craft && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --install-deps nextcloud-client && \
scl run gcc-toolset-14 -- PKG_CONFIG_PATH=/usr/lib64/pkgconfig/:/usr/share/pkgconfig python3 /root/craftmaster/CraftMaster.py --config /root/craftmaster.ini --target linux-gcc-x86_64 -c --no-cache -i kde/frameworks/tier1/karchive && \
Expand Down
4 changes: 3 additions & 1 deletion client-appimage-qt6/craftmaster.qt-6.9.3.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[General]
Branch = stable-4.0-qt-6.9.3
CraftUrl = https://github.com/nextcloud/craft.git
CraftRevision = 7a6af6465396c2271d3f4b49d5a4c13c052a3aeb
CraftRevision = 22cf36e8e0b6d0091b6ced384650588ddd5ad0ea
ShallowClone = False

# Variables defined here override the default value
Expand Down Expand Up @@ -40,6 +40,8 @@ nextcloud-client.buildTests = True
binary/mysql.useMariaDB = False
libs/qt6.version = 6.9.3
craft/craft-blueprints-kde.revision = stable-4.0
libs/zlib.version = 1.3.1
libs/openssl.version = 3.5.7

[windows-msvc2022_64-cl]
Packager/PackageType = NullsoftInstallerPackager
Expand Down
Loading