From 47be08bcf36e51e3abccdc9e500e457428b2b89b Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 08:41:00 +0100 Subject: [PATCH 01/10] Added CI config --- .gitignore | 1 - .woodpecker.yml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .woodpecker.yml diff --git a/.gitignore b/.gitignore index a271796..39cf456 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ PKGBUILD .SRCINFO .gitignore -* diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..7a82b2d --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,22 @@ +pipeline: + build: + image: 'archlinux:latest' + commands: + # Update packages + - pacman -Syu --needed --noconfirm base-devel + # Create non-root user to perform build & switch to their home + - groupadd -g 1000 builder + - useradd -mg builder builder + - chown -R builder:builder "$PWD" + - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers" + - su builder + # Build the package + - MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed + + publish: + image: 'archlinux:latest' + commands: + # Publish the package + - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish' + secrets: + - api_key From 14c13e2078371f1a3c7edd7715d59f87a9f2ad24 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sun, 2 Jan 2022 11:27:32 +0100 Subject: [PATCH 02/10] Changed package name; disabled trustdns --- PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 8b75153..8375a44 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Felix Bühler -pkgname=newsflash-git +pkgname=jjr-newsflash _pkgname=news_flash_gtk pkgver=684.fea372a pkgrel=1 @@ -19,6 +19,12 @@ pkgver() { echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) } +prepare() { + cd "${_pkgname}" + # Trustdns likes to bug out when not on a stable network + sed -i 's/\.trust_dns(true)/\.trust_dns(false)/' src/util/mod.rs +} + build() { cd "${_pkgname}" #rm -rf _build From 410b4acc3ea4140389ed71353317f008e9d64444 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 5 Jan 2022 20:54:42 +0100 Subject: [PATCH 03/10] Hopefully added sccache support --- .woodpecker.yml | 8 ++++++++ PKGBUILD | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7a82b2d..90bfc87 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,6 +1,14 @@ pipeline: build: image: 'archlinux:latest' + environment: + - SCCACHE_BUCKET=bur + - SCCACHE_ENDPOINT=s3.rustybever.be + - SCCACHE_S3_USE_SSL=true + - SCCACHE_S3_KEY_PREFIX=jjr-newsflash + 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 8375a44..2407a4b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) depends=(libhandy webkit2gtk) -makedepends=(git cargo meson rust) +makedepends=(git cargo meson rust sccache) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") sha512sums=("SKIP") From 6b436792e667a07be2c2e33bfcefc43e8fd4ef04 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 5 Jan 2022 20:56:59 +0100 Subject: [PATCH 04/10] Forgot RUSTC_WRAPPER --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 90bfc87..11f49d9 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,6 +6,7 @@ pipeline: - SCCACHE_ENDPOINT=s3.rustybever.be - SCCACHE_S3_USE_SSL=true - SCCACHE_S3_KEY_PREFIX=jjr-newsflash + - RUSTC_WRAPPER=/usr/bin/sccache secrets: - aws_access_key_id - aws_secret_access_key From 9619f3ca27fadb9fb0796af613db4c7daa5f79ab Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 29 Jan 2022 09:13:46 +0100 Subject: [PATCH 05/10] Pinned platform --- .woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7a82b2d..d511120 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,5 @@ +platform: linux/amd64 + pipeline: build: image: 'archlinux:latest' From 865e887a0937ae17d3b56f5b377daa3ca9c69f9a Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 29 Jan 2022 09:14:43 +0100 Subject: [PATCH 06/10] Always pull --- .woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 67f9704..323a9d4 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,6 +3,7 @@ platform: linux/amd64 pipeline: build: image: 'archlinux:latest' + pull: true environment: - SCCACHE_BUCKET=bur - SCCACHE_ENDPOINT=s3.rustybever.be From 42e48769b7d03541155fea44ca106ae1f3cb2b14 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 2 Feb 2022 11:32:10 +0100 Subject: [PATCH 07/10] Switched to vieter server --- .woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 11f49d9..6e65157 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,5 @@ +platform: linux/amd64 + pipeline: build: image: 'archlinux:latest' @@ -26,6 +28,6 @@ pipeline: image: 'archlinux:latest' commands: # Publish the package - - 'curl -F "file=@$(ls *.pkg*)" -H "X-API-KEY: $API_KEY" https://pkgs.rustybever.be/api/publish' + - 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish' secrets: - api_key From b53d0521c3a22b201f629e34abd8544c966f46e3 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 2 Feb 2022 11:38:26 +0100 Subject: [PATCH 08/10] Updated dependencies --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2407a4b..23d6e1c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=(libhandy webkit2gtk) +depends=(libadwaita gtk4 webkit2gtk-5.0) makedepends=(git cargo meson rust sccache) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") From a6b36a01b5b58ce7f81169e1824f8c86e1033b61 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 14 Feb 2022 14:51:17 +0100 Subject: [PATCH 09/10] bump gtk4 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2bdf3c6..8d4ffd0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = newsflash-git pkgdesc = The spiritual successor to FeedReader - pkgver = 684.fea372a + pkgver = 1070.0d9f8d9 pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk arch = any @@ -9,11 +9,11 @@ pkgbase = newsflash-git makedepends = cargo makedepends = meson makedepends = rust + depends = libadwaita depends = libhandy - depends = webkit2gtk + depends = webkit2gtk-5.0 conflicts = newsflash source = git+https://gitlab.com/news-flash/news_flash_gtk.git sha512sums = SKIP pkgname = newsflash-git - diff --git a/PKGBUILD b/PKGBUILD index 8b75153..9585b4d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,13 +2,13 @@ pkgname=newsflash-git _pkgname=news_flash_gtk -pkgver=684.fea372a +pkgver=1070.0d9f8d9 pkgrel=1 pkgdesc="The spiritual successor to FeedReader" arch=(any) url="https://gitlab.com/news-flash/news_flash_gtk" license=(GPL3) -depends=(libhandy webkit2gtk) +depends=(libadwaita libhandy webkit2gtk-5.0) makedepends=(git cargo meson rust) conflicts=(newsflash) source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") From 25eb4c6166ba400ba3961effb8d9dd21acc929c1 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Tue, 24 May 2022 11:49:25 +0200 Subject: [PATCH 10/10] Cleaned up PKGBUILD --- .SRCINFO | 18 +++++++++--------- .gitignore | 8 +++++--- PKGBUILD | 43 +++++++++++++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 26 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8d4ffd0..dc97e10 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,19 @@ -pkgbase = newsflash-git - pkgdesc = The spiritual successor to FeedReader - pkgver = 1070.0d9f8d9 +pkgbase = jjr-newsflash-git + pkgdesc = The spiritual successor to FeedReader (development version) + pkgver = 1141.40ff7cf pkgrel = 1 url = https://gitlab.com/news-flash/news_flash_gtk - arch = any + arch = x86_64 license = GPL3 makedepends = git - makedepends = cargo makedepends = meson makedepends = rust depends = libadwaita - depends = libhandy + depends = gtk4 depends = webkit2gtk-5.0 conflicts = newsflash - source = git+https://gitlab.com/news-flash/news_flash_gtk.git - sha512sums = SKIP + conflicts = newsflash-git + source = news_flash_gtk::git+https://gitlab.com/news-flash/news_flash_gtk.git + md5sums = SKIP -pkgname = newsflash-git +pkgname = jjr-newsflash-git diff --git a/.gitignore b/.gitignore index 39cf456..c6a9b95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ -PKGBUILD -.SRCINFO -.gitignore +* + +!.gitignore +!PKGBUILD +!.SRCINFO diff --git a/PKGBUILD b/PKGBUILD index 163c864..26f2295 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,38 +1,53 @@ -# Maintainer: Felix Bühler +# vim: ft=bash +# Maintainer: Jef Roosens +# Contributor: Felix Bühler -pkgname=jjr-newsflash -_pkgname=news_flash_gtk -pkgver=1070.0d9f8d9 +_pkgname='news_flash_gtk' +pkgname='jjr-newsflash-git' +pkgver=1141.40ff7cf pkgrel=1 -pkgdesc="The spiritual successor to FeedReader" +pkgdesc='The spiritual successor to FeedReader (development version)' arch=('x86_64') -url="https://gitlab.com/news-flash/news_flash_gtk" -license=(GPL3) -depends=(libadwaita gtk4 webkit2gtk-5.0) -makedepends=(git cargo meson rust sccache) -conflicts=(newsflash) -source=("git+https://gitlab.com/news-flash/news_flash_gtk.git") -sha512sums=("SKIP") + +url='https://gitlab.com/news-flash/news_flash_gtk' +license=('GPL3') +depends=( + 'libadwaita' + 'gtk4' + 'webkit2gtk-5.0' +) +makedepends=( + 'git' + 'meson' + 'rust' +) + +conflicts=('newsflash' 'newsflash-git') +source=("${_pkgname}::git+https://gitlab.com/news-flash/news_flash_gtk.git") +md5sums=("SKIP") pkgver() { cd "${_pkgname}" + echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) } prepare() { cd "${_pkgname}" + # Trustdns likes to bug out when not on a stable network sed -i 's/\.trust_dns(true)/\.trust_dns(false)/' src/util/mod.rs } build() { cd "${_pkgname}" - #rm -rf _build + arch-meson _build ninja -C _build } package() { cd "${_pkgname}" - env DESTDIR="$pkgdir" ninja -C _build install + + env DESTDIR="${pkgdir}" ninja -C _build install }