From 9391266b6830aadb2c86ea56a4d42703ce37e4e5 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 5 Jan 2022 20:32:33 +0100 Subject: [PATCH] Hopefully added sccache config --- .gitignore | 4 ++++ .woodpecker.yml | 7 +++++++ PKGBUILD | 19 ++++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..af8ad5e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +* + +!PKGBUILD +!.woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml index 7a82b2d..17f0ff6 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,13 @@ pipeline: build: image: 'archlinux:latest' + environment: + - SCCACHE_BUCKET=bur + - SCCACHE_ENDPOINT=s3.rustybever.be + - SCCACHE_S3_USE_SSL=true + secrets: + - aws_access_key_id + - aws_secret_access_key commands: # Update packages - pacman -Syu --needed --noconfirm base-devel diff --git a/PKGBUILD b/PKGBUILD index 44fe9d5..70950b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Joseph Donofry pkgname=jjr-nheko -pkgver=0.9.1.r85.g970ed56f +pkgver=0.9.1.r86.g8d52c17f pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64" "aarch64") @@ -10,8 +10,8 @@ arch=("i686" "x86_64" "aarch64") url="https://github.com/Nheko-Reborn/nheko" license=("GPL3") -depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "gst-plugin-qmlgl" "libnice" "libolm" "spdlog" "curl" "libevent") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc") +depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "gst-plugin-qmlgl" "libnice" "libolm" "spdlog" "curl" "libevent" "qt5-imageformats") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc" "sccache") optdepends=("qt-jdenticon") provides=("nheko") conflicts=("nheko" "nheko-git") @@ -33,8 +33,17 @@ build() { rm -f cmake/FindOlm.cmake - cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_COEURL=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release - cmake --build build --config Release + cmake -H. -Bbuild \ + -DHUNTER_ENABLED=OFF \ + -DBUILD_SHARED_LIBS=OFF \ + -DUSE_BUNDLED_MTXCLIENT=ON \ + -DUSE_BUNDLED_COEURL=ON \ + -DUSE_BUNDLED_LMDBXX=ON \ + -DCMAKE_INSTALL_PREFIX=.deps/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER_LAUNCHER=sccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=sccache + SCCACHE_S3_KEY_PREFIX="$pkgname" cmake --build build --config Release } package() {