From 1a0b2fa7fa3bfc62e84f7441d84b48c0b1284404 Mon Sep 17 00:00:00 2001 From: tjh Date: Fri, 03 Apr 2026 14:56:39 +0000 Subject: [PATCH] feat: bump to 1.14.0-alpha and add knotmirror-git Signed-off-by: tjh --- README.md | 6 +++--- conf.sh | 2 +- appview/.SRCINFO | 6 +++--- appview/PKGBUILD | 26 ++++++++++++-------------- knotmirror-git/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++ knotserver-git/.SRCINFO | 2 +- knotserver-git/PKGBUILD | 2 +- knotserver/.SRCINFO | 6 +++--- knotserver/PKGBUILD | 10 +++++----- spindle/.SRCINFO | 6 +++--- spindle/PKGBUILD | 4 ++-- src/knotserver/PKGBUILD.sh | 6 +++--- 12 file(s) changed, 74 insertion(s)(+), 39 deletion(s)(-) diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -25,11 +25,11 @@ ### [appview](appview) -Builds `appview` from tag [v1.12.0-alpha](https://tangled.org/tangled.org/core/tree/v1.12.0-alpha). +Builds `appview` from tag [v1.14.0-alpha](https://tangled.org/tangled.org/core/tree/v1.14.0-alpha). ### [knotserver](knotserver) -Builds `knot` from tag [v1.12.0-alpha](https://tangled.org/tangled.org/core/tree/v1.12.0-alpha). +Builds `knot` from tag [v1.14.0-alpha](https://tangled.org/tangled.org/core/tree/v1.14.0-alpha). ### [knotserver-git](knotserver-git) @@ -37,5 +37,5 @@ ### [spindle](spindle) -Builds `spindle` from tag [v1.12.0-alpha](https://tangled.org/tangled.org/core/tree/v1.12.0-alpha). +Builds `spindle` from tag [v1.14.0-alpha](https://tangled.org/tangled.org/core/tree/v1.14.0-alpha). diff --git a/conf.sh b/conf.sh --- a/conf.sh +++ b/conf.sh @@ -1,4 +1,4 @@ -tag=1.12.0-alpha +tag=1.14.0-alpha knotserver_user=git knotserver_group=git knotserver_path=/var/lib/knotserver diff --git a/appview/.SRCINFO b/appview/.SRCINFO --- a/appview/.SRCINFO +++ b/appview/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = appview pkgdesc = git collaboration platform built on ATproto - pkgver = 1.12.0.alpha + pkgver = 1.13.0.alpha pkgrel = 1 url = https://tangled.org/tangled.org/core arch = x86_64 @@ -10,12 +10,12 @@ depends = git options = strip options = !debug - source = core-v1.12.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/refs%2Ftags%2Fv1.12.0-alpha + source = core-v1.13.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/v1.13.0-alpha?prefix=core-v1.13.0-alpha source = https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js source = https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip source = https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip source = https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-mono%401.1.0/ibm-plex-mono.zip - sha256sums = ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40 + sha256sums = dbb9f13f832c47fe5a285293614be7ca8cb806f7f5ad5f84b60e714b6f420508 sha256sums = e209dda5c8235479f3166defc7750e1dbcd5a5c1808b7792fc2e6733768fb447 sha256sums = cc9c1db50676416f6fbb4bbaf8fba46f83331ed7c895dd9602145aebd0daa20e sha256sums = 9883fdd4a49d4fb66bd8177ba6625ef9a64aa45899767dde3d36aa425756b11e diff --git a/appview/PKGBUILD b/appview/PKGBUILD --- a/appview/PKGBUILD +++ b/appview/PKGBUILD @@ -1,4 +1,5 @@ -_pkgver=1.12.0-alpha +_pkgver=1.13.0-alpha +_core=core-v${_pkgver} pkgname=appview pkgdesc='git collaboration platform built on ATproto' pkgver=${_pkgver/\-/\.} @@ -9,32 +10,30 @@ depends=(git) makedepends=(go npm) options=(strip !debug) -source=("core-v${_pkgver}.tar.gz::${url}/archive/refs%2Ftags%2Fv${_pkgver}" +source=("${_core}.tar.gz::${url}/archive/v${_pkgver}?prefix=${_core}" "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip" "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" "https://github.com/IBM/plex/releases/download/%40ibm%2Fplex-mono%401.1.0/ibm-plex-mono.zip") -sha256sums=('ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40' +sha256sums=('dbb9f13f832c47fe5a285293614be7ca8cb806f7f5ad5f84b60e714b6f420508' 'e209dda5c8235479f3166defc7750e1dbcd5a5c1808b7792fc2e6733768fb447' 'cc9c1db50676416f6fbb4bbaf8fba46f83331ed7c895dd9602145aebd0daa20e' '9883fdd4a49d4fb66bd8177ba6625ef9a64aa45899767dde3d36aa425756b11e' '4bfc936d0e1fd19db6327a3786eabdbc3dc0d464500576f6458f6706df68d26c') build() { - tangled_src=core-v${_pkgver} mkdir -p "${srcdir}/build" - mkdir -p ${srcdir}/${tangled_src}/appview/pages/static/{fonts,icons} - cp -f "${srcdir}/htmx.min.js" "${srcdir}/${tangled_src}/appview/pages/static/htmx.min.js" - cp -rf ${srcdir}/icons/*.svg "${srcdir}/${tangled_src}/appview/pages/static/icons/" - cp -f ${srcdir}/web/InterVariable*.woff2 "${srcdir}/${tangled_src}/appview/pages/static/fonts/" - cp -f ${srcdir}/web/InterDisplay*.woff2 "${srcdir}/${tangled_src}/appview/pages/static/fonts/" - cp -f "${srcdir}/ibm-plex-mono/fonts/complete/woff2/IBMPlexMono-Regular.woff2" "${srcdir}/${tangled_src}/appview/pages/static/fonts/" + mkdir -p ${srcdir}/${_core}/appview/pages/static/{fonts,icons} + cp -f "${srcdir}/htmx.min.js" "${srcdir}/${_core}/appview/pages/static/htmx.min.js" + cp -rf ${srcdir}/icons/*.svg "${srcdir}/${_core}/appview/pages/static/icons/" + cp -f ${srcdir}/web/InterVariable*.woff2 "${srcdir}/${_core}/appview/pages/static/fonts/" + cp -f ${srcdir}/web/InterDisplay*.woff2 "${srcdir}/${_core}/appview/pages/static/fonts/" + cp -f "${srcdir}/ibm-plex-mono/fonts/complete/woff2/IBMPlexMono-Regular.woff2" "${srcdir}/${_core}/appview/pages/static/fonts/" pwd - cd ${srcdir}/${tangled_src} + cd ${srcdir}/${_core} npm install tailwindcss@3 @tailwindcss/typography npx tailwindcss -i input.css -o appview/pages/static/tw.css - cd ${srcdir} export CGO_ENABLED=1 export CGO_CPPFLAGS="${CPPFLAGS}" @@ -42,11 +41,10 @@ export CGO_CXXFLAGS="${CXXFLAGS}" export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - cd ${srcdir}/${tangled_src} go build -o "${srcdir}/build/appview" ./cmd/appview } package() { install -Dm755 "${srcdir}/build/appview" "${pkgdir}/usr/bin/appview" - install -Dm644 "${srcdir}/core-v${_pkgver}/license" "${pkgdir}/usr/share/licenses/tangled/appview.LICENSE" + install -Dm644 "${srcdir}/${_core}/license" "${pkgdir}/usr/share/licenses/tangled/appview.LICENSE" } diff --git a/knotmirror-git/PKGBUILD b/knotmirror-git/PKGBUILD new file mode 100644 --- /dev/null +++ b/knotmirror-git/PKGBUILD @@ -0,0 +1,37 @@ +_pkgname=knotmirror +pkgname=${_pkgname}-git +pkgdesc='git collaboration platform built on ATproto' +pkgver=1.12.0.alpha.r102.g1591c48 +pkgrel=1 +license=(MIT) +arch=(x86_64) +url=https://tangled.org/tangled.org/core +depends=(git) +makedepends=(go) +options=(strip) +source=("tangled::git+$url") +sha256sums=('SKIP') + +pkgver() { + cd ${srcdir}/tangled + git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + mkdir -p ${srcdir}/build + + export CGO_ENABLED=1 + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + + cd ${srcdir}/tangled + go build -o "${srcdir}/build/knotmirror" ./cmd/knotmirror +} + +package() { + install -Dm755 "${srcdir}/build/knotmirror" "${pkgdir}/usr/bin/knotmirror" + install -Dm644 "${srcdir}/tangled/license" "${pkgdir}/usr/share/licenses/tangled/knotmirror.LICENSE" +} diff --git a/knotserver-git/.SRCINFO b/knotserver-git/.SRCINFO --- a/knotserver-git/.SRCINFO +++ b/knotserver-git/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = knotserver-git pkgdesc = git collaboration platform built on ATproto - pkgver = 1.9.1.alpha.r48.g8f7177a + pkgver = 1.12.0.alpha.r102.g1591c48 pkgrel = 1 url = https://tangled.org/tangled.org/core install = knotserver.install diff --git a/knotserver-git/PKGBUILD b/knotserver-git/PKGBUILD --- a/knotserver-git/PKGBUILD +++ b/knotserver-git/PKGBUILD @@ -1,7 +1,7 @@ _pkgname=knotserver pkgname=${_pkgname}-git pkgdesc='git collaboration platform built on ATproto' -pkgver=1.9.1.alpha.r48.g8f7177a +pkgver=1.12.0.alpha.r102.g1591c48 pkgrel=1 license=(MIT) arch=(x86_64) diff --git a/knotserver/.SRCINFO b/knotserver/.SRCINFO --- a/knotserver/.SRCINFO +++ b/knotserver/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = knotserver pkgdesc = git collaboration platform built on ATproto - pkgver = 1.12.0.alpha + pkgver = 1.14.0.alpha pkgrel = 1 url = https://tangled.org/tangled.org/core install = knotserver.install @@ -11,11 +11,11 @@ conflicts = knotserver-git options = strip options = !debug - source = core-v1.12.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/refs%2Ftags%2Fv1.12.0-alpha + source = core-v1.14.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/v1.14.0-alpha?prefix=core source = knotserver.service source = knotserver-sshd.conf source = knotserver-tmpfiles.conf - sha256sums = ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40 + sha256sums = 31049dcb308d81f06c1724e59e737c9eb839e027a29ff9bcbc0488cf6457bd4e sha256sums = 91bf996bc8ea97a6c4bcd0ebf5ab2f341bb1f6fa6da0190c9ff95c4debb217f8 sha256sums = 825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8 sha256sums = 21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394 diff --git a/knotserver/PKGBUILD b/knotserver/PKGBUILD --- a/knotserver/PKGBUILD +++ b/knotserver/PKGBUILD @@ -1,5 +1,5 @@ _pkgname=knotserver -_pkgver=1.12.0-alpha +_pkgver=1.14.0-alpha pkgname=${_pkgname/\-/\.} pkgdesc='git collaboration platform built on ATproto' pkgver=${_pkgver/\-/\.} @@ -12,11 +12,11 @@ makedepends=(go) options=(strip !debug) install=${_pkgname}.install -source=("core-v${_pkgver}.tar.gz::${url}/archive/refs%2Ftags%2Fv${_pkgver}" +source=("core-v${_pkgver}.tar.gz::${url}/archive/v${_pkgver}?prefix=core" ${_pkgname}.service ${_pkgname}-sshd.conf ${_pkgname}-tmpfiles.conf) -sha256sums=('ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40' +sha256sums=('31049dcb308d81f06c1724e59e737c9eb839e027a29ff9bcbc0488cf6457bd4e' '91bf996bc8ea97a6c4bcd0ebf5ab2f341bb1f6fa6da0190c9ff95c4debb217f8' '825ad80eccdfc473674cab83e4bd63d0e3b129d600b4628803d8241430da5bf8' '21accf6d6d6c9fb545f801cb0a6d98271f7205e504249cc7fdff53ba83203394') @@ -31,7 +31,7 @@ export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - cd ${srcdir}/core-v${_pkgver} + cd ${srcdir}/core go build -ldflags "-X tangled.org/core/knotserver/xrpc.version=${_pkgver}" -o "${srcdir}/build/knot" ./cmd/knot } @@ -40,5 +40,5 @@ install -Dm644 "${srcdir}/${_pkgname}-tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" install -Dm644 "${srcdir}/${_pkgname}-sshd.conf" "${pkgdir}/usr/lib/systemd/sshd_config.d/${_pkgname}.conf" install -Dm755 "${srcdir}/build/knot" "${pkgdir}/usr/bin/knot" - install -Dm644 "${srcdir}/core-v${_pkgver}/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" + install -Dm644 "${srcdir}/core/license" "${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" } diff --git a/spindle/.SRCINFO b/spindle/.SRCINFO --- a/spindle/.SRCINFO +++ b/spindle/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spindle pkgdesc = git collaboration platform built on ATproto - pkgver = 1.12.0.alpha + pkgver = 1.14.0.alpha pkgrel = 1 url = https://tangled.org/tangled.org/core arch = x86_64 @@ -11,11 +11,11 @@ conflicts = spindle-git options = strip options = !debug - source = core-v1.12.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/refs%2Ftags%2Fv1.12.0-alpha + source = core-v1.14.0-alpha.tar.gz::https://tangled.org/tangled.org/core/archive/refs%2Ftags%2Fv1.14.0-alpha source = spindle.service source = spindle.sysusers source = spindle-tmpfiles.conf - sha256sums = ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40 + sha256sums = dc7f887145c195f96b2f81d6017dc52e97dcc491ebebcf14da647ba81b003816 sha256sums = 6509c3c71ed305cc8cdf59f54261538a2f554621ae6116bb2f78ebe92b8d64bb sha256sums = 1364062c3d0daa6fa8fc439bf26e88585d503a36b9f8335bae037f659b08bd15 sha256sums = 28673b854e9cd65cb129f46bc1dc894fb74a62fa3b976f2e1e5737558096b499 diff --git a/spindle/PKGBUILD b/spindle/PKGBUILD --- a/spindle/PKGBUILD +++ b/spindle/PKGBUILD @@ -1,5 +1,5 @@ _pkgname=spindle -_pkgver=1.12.0-alpha +_pkgver=1.14.0-alpha pkgname=${_pkgname/\-/\.} pkgdesc='git collaboration platform built on ATproto' pkgver=${_pkgver/\-/\.} @@ -15,7 +15,7 @@ ${_pkgname}.service ${_pkgname}.sysusers ${_pkgname}-tmpfiles.conf) -sha256sums=('ab0b446cdd5d543de3becaa74fa31c3ffaf90262eb8f7d246b9cdee3118fef40' +sha256sums=('dc7f887145c195f96b2f81d6017dc52e97dcc491ebebcf14da647ba81b003816' '6509c3c71ed305cc8cdf59f54261538a2f554621ae6116bb2f78ebe92b8d64bb' '1364062c3d0daa6fa8fc439bf26e88585d503a36b9f8335bae037f659b08bd15' '28673b854e9cd65cb129f46bc1dc894fb74a62fa3b976f2e1e5737558096b499') diff --git a/src/knotserver/PKGBUILD.sh b/src/knotserver/PKGBUILD.sh --- a/src/knotserver/PKGBUILD.sh +++ b/src/knotserver/PKGBUILD.sh @@ -15,7 +15,7 @@ makedepends=(go) options=(strip !debug) install=\${_pkgname}.install -source=("core-v\${_pkgver}.tar.gz::\${url}/archive/refs%2Ftags%2Fv\${_pkgver}" +source=("core-v\${_pkgver}.tar.gz::\${url}/archive/v\${_pkgver}?prefix=core" \${_pkgname}.service \${_pkgname}-sshd.conf \${_pkgname}-tmpfiles.conf) @@ -34,7 +34,7 @@ export CGO_LDFLAGS="\${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" - cd \${srcdir}/core-v\${_pkgver} + cd \${srcdir}/core go build -ldflags "-X tangled.org/core/knotserver/xrpc.version=\${_pkgver}" -o "\${srcdir}/build/knot" ./cmd/knot } @@ -43,6 +43,6 @@ install -Dm644 "\${srcdir}/\${_pkgname}-tmpfiles.conf" "\${pkgdir}/usr/lib/tmpfiles.d/\${_pkgname}.conf" install -Dm644 "\${srcdir}/\${_pkgname}-sshd.conf" "\${pkgdir}/usr/lib/systemd/sshd_config.d/\${_pkgname}.conf" install -Dm755 "\${srcdir}/build/knot" "\${pkgdir}/usr/bin/knot" - install -Dm644 "\${srcdir}/core-v\${_pkgver}/license" "\${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" + install -Dm644 "\${srcdir}/core/license" "\${pkgdir}/usr/share/licenses/tangled/knotserver.LICENSE" } EOF -- tangled.sh