Fix build workflow checking out correct branch

On running from workflow_run should check out the ref that workflow_run
was running on.

.github/workflows/build.yaml

@@ -96,7 +96,15 @@ jobs:
           ref: master
           fetch-depth: 1
 
+      - name: checkout local templates from prev workflow
+        if: "${{ github.event_name == 'workflow_run' }}"
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
+          path: added-packages
+
       - name: checkout local templates
+        if: "${{ github.event_name != 'workflow_run' }}"
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}

.github/workflows/checksum.yaml

@@ -9,6 +9,14 @@ on:
       - synchronize
     branches:
       - main
+  workflow_dispatch:
+    inputs:
+      changed-pkg:
+        description: "Package to checksum"
+        default: ""
+
+env:
+  CHANGED_PKG: ${{ github.event.inputs.changed-pkg }}
 
 jobs:
   checksum:
@@ -41,11 +49,18 @@ jobs:
           ref: ${{ github.ref }}
 
       - name: remember changed package
+        if: ${{ env.CHANGED_PKG == '' }}
         run: |
           git config --global --add safe.directory $PWD
           echo "CHANGED_PKG=$(git diff --name-only origin/main origin/${GITHUB_HEAD_REF} "srcpkgs/*/template" | head -1 | cut -d/ -f2)" >> $GITHUB_ENV
           echo "CHANGED: ${{ env.CHANGED_PKG }}"
 
+      - name: cache upstream
+        uses: actions/cache@v4
+        with:
+          path: upstream
+          key: void-templates-upstream-packages
+
       - name: checkout upstream templates
         uses: actions/checkout@v4
         with:
@@ -66,7 +81,9 @@ jobs:
 
       - name: generate checksum
         working-directory: upstream
-        run: "sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }}"
+        run: |
+          chown -R builder:builder . &&
+          sudo -Eu builder xgensum -f -i ${{ env.CHANGED_PKG }}
 
       - name: receive relevant copy from upstream
         run: |

.github/workflows/renovate.yaml

@@ -2,9 +2,14 @@ name: Check package updates
 on:
   schedule:
     - cron: "0 * * * *"
+  workflow_dispatch:
+    inputs:
+      log-level:
+        description: "Log level"
+        default: "info"
 
 env:
-  LOG_LEVEL: "info"
+  LOG_LEVEL: ${{ github.event.inputs.log-level }}
   RENOVATE_AUTODISCOVER: true
   RENOVATE_AUTODISCOVER_FILTER: "${{ github.repository }}"
   RENOVATE_PLATFORM: github

README.md

@@ -25,7 +25,7 @@ Then all packages herein can be installed.
 - [x] Detect changed packages from previous builds
 - [x] build only for those packages
 - [x] serve from custom repository
-- [ ] detect upstream changes and update templates
+- [x] detect upstream changes and update templates
 - [ ] build for multiple (appropriate) arches
 
 ## Package wishlist

srcpkgs/bemoji/template

@@ -1,6 +1,6 @@
 # Template file for 'bemoji'
 pkgname=bemoji
-version=0.4.0
+version=0.4.0 # renovate: datasource=github-tags depName=marty-oehme/bemoji
 revision=1
 depends="bash coreutils"
 short_desc="emoji picker that remembers your favorites"

srcpkgs/dotter/template

@@ -1,6 +1,6 @@
 # Template file for 'dotter'
 pkgname=dotter
-version=0.13.3
+version=0.13.3 # renovate: datasource=github-tags depName=SuperCuber/dotter
 revision=1
 build_style=cargo
 hostmakedepends="rust"

srcpkgs/filtile-bin/template

@@ -1,5 +1,5 @@
 pkgname=filtile-bin
-version=1.2.1
+version=1.2.1 # renovate: datasource=github-tags depName=pkulak/filtile
 revision=1
 archs="x86_64"
 depends="river"
@@ -9,7 +9,7 @@ license="GPL-3.0"
 homepage="https://github.com/pkulak/filtile"
 distfiles="https://github.com/pkulak/filtile/releases/download/v${version}/filtile-x86_64-unknown-linux-gnu.tar.gz"
 checksum=aa0b3e0dbb2126f44f153f2f6d1fd37f6961bf7153895aff50e3cc6bce191466
- 
+
 do_install() {
     vbindir=/usr/bin
 

srcpkgs/localsend-go/template

@@ -1,20 +1,19 @@
 # Template file for 'localsend-go'
 pkgname=localsend-go
-version=1.2.5
+version=1.2.7 # renovate: datasource=github-tags depName=meowrain/localsend-go
 revision=2
 build_style=go
-go_import_path="localsend_cli"
-go_package="./cmd"
+go_import_path="github.com/meowrain/localsend-go"
 depends="libcap-progs"
 short_desc="CLI for localsend implemented in Go"
 maintainer="Marty Oehme <contact@martyoeh.me>"
 license="MIT"
 homepage="https://github.com/meowrain/localsend-go"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=48d6b94b7cbcf6b07400c7293401a0d329e15c6ab1f3493e31363a5525e73b00
+checksum=03ad0ae0fec719ec6425023338c8f4017f78237940c868435f8601addb9e99cd
 
 do_install() {
-    vbin ${GOPATH}/bin/cmd localsend_cli
+    vbin ${GOPATH}/bin/localsend-go localsend-go
 }
 
 # have to turn it off currently since

srcpkgs/ly-git/files/ly/conf

@@ -1,12 +0,0 @@
-if [ -x /sbin/agetty -o -x /bin/agetty ]; then
-	# util-linux specific settings
-	if [ "${tty}" = "tty1" ]; then
-		GETTY_ARGS="--noclear"
-	fi
-fi
-
-BAUD_RATE=38400
-TERM_NAME=linux
-
-auxtty=$(/bin/cat $CONFIG_DIRECTORY/ly/config.ini 2>/dev/null 1| /bin/sed -n 's/\(^[[:space:]]*tty[[:space:]]*=[[:space:]]*\)\([[:digit:]][[:digit:]]*\)\(.*\)/\2/p')
-TTY=tty${auxtty:-$DEFAULT_TTY}

srcpkgs/ly-git/files/ly/finish

@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-
-exec utmpset -w ${TTY}

srcpkgs/ly-git/files/ly/run

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-[ -r conf ] && . ./conf
-
-if [ -x /sbin/getty -o -x /bin/getty ]; then
-	# busybox
-	GETTY=getty
-elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
-	# util-linux
-	GETTY=agetty
-fi
-
-exec setsid ${GETTY} ${GETTY_ARGS} -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME "${TTY}" "${BAUD_RATE}" "${TERM_NAME}"

srcpkgs/ly-git/template

@@ -1,36 +0,0 @@
-# Template file for 'ly'
-pkgname=ly-git
-version=20241012
-revision=1
-_commit=e125d8f1aa1544a6a106047c0acd7a7d2e0ff16c
-archs="x86_64"
-build_style=zig-build
-configure_args="installrunit -Dpie"
-hostmakedepends="git"
-makedepends="pam-devel libxcb-devel"
-depends=""
-short_desc="Display manager with console UI"
-maintainer="Marty Oehme <contact@martyoeh.me>"
-license="WTFPL"
-homepage="https://github.com/fairyglade/ly"
-#changelog=""
-distfiles="${homepage}/archive/${_commit}.tar.gz"
-checksum=5c33daa89b680ebce6dd37a0edfaa9f68066c4646708bcf020233c6a58d53561
-nostrip=yes
-
-do_build() {
-    DESTDIR="zig-out" zig build -j"${XBPS_MAKEJOBS}" --sysroot "${XBPS_CROSS_BASE}" --search-prefix "${XBPS_CROSS_BASE}/usr" --prefix /usr --global-cache-dir /host/zig --verbose
-}
-
-do_install() {
-		vlicense license.md
-		vdoc readme.md
-		vbin zig-out/usr/bin/ly
-		vmkdir /etc/ly
-		vinstall res/config.ini 0644 /etc/ly
-		vinstall res/setup.sh 0755 /etc/ly
-		vinstall res/pam.d/ly 0644 /etc/pam.d
-		vcopy res/lang /etc/ly/lang
-
-		vsv ly
-}

srcpkgs/netbird-bin/template

@@ -1,6 +1,6 @@
 # Template file for 'netbird-bin'
 pkgname=netbird-bin
-version=0.39.1
+version=0.48.0 # renovate: datasource=github-tags depName=netbirdio/netbird
 revision=1
 archs="x86_64"
 short_desc="Connect your devices into a secure WireGuard-based overlay network with SSO, MFA and granular access controls."
@@ -8,7 +8,7 @@ maintainer="Marty Oehme <contact@martyoeh.me>"
 license="BSD-3-Clause"
 homepage="https://github.com/netbirdio/netbird"
 distfiles="${homepage}/releases/download/v${version}/netbird_${version}_linux_amd64.tar.gz"
-checksum=ac4dbf589cf33dc1c347a6dba569cdcaf8a6915f88c6a7baffdb35fcf9b954f0
+checksum=be159667436e4f8c58c78f72dd5602ccca2515eed05dd2fef4ee6f64e1d79b87
 
 do_install() {
     vbin netbird

srcpkgs/tgpt/template

@@ -1,6 +1,6 @@
 # Template file for 'tgpt'
 pkgname=tgpt
-version=2.10.0
+version=2.10.0 # renovate: datasource=github-tags depName=aandrew-me/tgpt
 revision=1
 build_style=go
 go_import_path="github.com/aandrew-me/tgpt/v2"

srcpkgs/topen/template

@@ -1,6 +1,6 @@
 # Template file for 'topen'
 pkgname=topen
-version=0.1.0
+version=0.1.0 # renovate: datasource=github-tags depName=marty-oehme/topen
 revision=1
 build_style=python3-pep517
 depends="python3-tasklib"