.woodpecker/.arch-rel.yml

@@ -1,39 +0,0 @@
-matrix:
-  PLATFORM:
-    - linux/amd64
-    - linux/arm64
-
-platform: ${PLATFORM}
-branches: [main]
-skip_clone: true
-
-pipeline:
-  build:
-    image: 'menci/archlinuxarm:base-devel'
-    commands:
-      # Add the vieter repository so we can use the compiler
-      - echo -e '[vieter]\nServer = https://arch.r8r.be/$repo/$arch\nSigLevel = Optional' >> /etc/pacman.conf
-      # Update packages
-      - pacman -Syu --noconfirm
-      # 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
-      # Due to a bug with the V compiler, we can't just use the PKGBUILD from
-      # inside the repo
-      - curl -OL "https://git.rustybever.be/vieter/vieter/raw/tag/$CI_COMMIT_TAG/PKGBUILD"
-      - makepkg -s --noconfirm --needed
-    when:
-      event: tag
-
-  publish:
-    image: 'curlimages/curl'
-    commands:
-      # Publish the package
-      - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "$pkg" -H "X-API-KEY: $VIETER_API_KEY" https://arch.r8r.be/vieter/publish; done'
-    secrets:
-      - vieter_api_key
-    when:
-      event: tag

.woodpecker/.arch.yml

@@ -23,7 +23,7 @@ pipeline:
       - su builder
       # Due to a bug with the V compiler, we can't just use the PKGBUILD from
       # inside the repo
-      - curl -o PKGBUILD -L https://git.rustybever.be/vieter/vieter/raw/branch/dev/PKGBUILD.dev
+      - curl -OL https://git.rustybever.be/vieter/vieter/raw/branch/dev/PKGBUILD
       - makepkg -s --noconfirm --needed
     when:
       event: push

CHANGELOG.md

@@ -15,11 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-* `vieter build` command now only builds a single repository & uploads the
+- `vieter build` command now only builds a single repository & uploads the
   build logs
-* Official Arch packages are now split between `vieter` & `vieter-git`
-    * `vieter` is the latest release
-    * `vieter-git` is the latest commit on the dev branch
 
 ## [0.3.0-alpha.1](https://git.rustybever.be/vieter/vieter/src/tag/0.3.0-alpha.1)
 

PKGBUILD

@@ -1,18 +1,23 @@
-# vim: ft=bash
 # Maintainer: Jef Roosens
 
 pkgbase='vieter'
 pkgname='vieter'
-pkgver='0.3.0_alpha.1'
+pkgver=0.2.0.r25.g20112b8
 pkgrel=1
-depends=('glibc' 'openssl' 'libarchive' 'sqlite')
+depends=('glibc' 'openssl' 'libarchive' 'gc' 'sqlite')
-makedepends=('git' 'vieter-v')
+makedepends=('git' 'gcc' 'vieter-v')
 arch=('x86_64' 'aarch64')
 url='https://git.rustybever.be/vieter/vieter'
 license=('AGPL3')
-source=("$pkgname::git+https://git.rustybever.be/vieter/vieter#tag=${pkgver//_/-}")
+source=($pkgname::git+https://git.rustybever.be/vieter/vieter#branch=dev)
 md5sums=('SKIP')
 
+pkgver() {
+    cd "$pkgname"
+
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
 build() {
     cd "$pkgname"
 
@@ -23,5 +28,5 @@ package() {
     pkgdesc="Vieter is a lightweight implementation of an Arch repository server."
 
     install -dm755 "$pkgdir/usr/bin"
-    install -Dm755 "$pkgname/pvieter" "$pkgdir/usr/bin/vieter"
+    install -Dm755 "$pkgbase/pvieter" "$pkgdir/usr/bin/vieter"
 }

PKGBUILD.dev

@@ -1,35 +0,0 @@
-# vim: ft=bash
-# Maintainer: Jef Roosens
-
-pkgbase='vieter-git'
-pkgname='vieter-git'
-pkgver=0.2.0.r25.g20112b8
-pkgrel=1
-depends=('glibc' 'openssl' 'libarchive' 'sqlite')
-makedepends=('git' 'vieter-v')
-arch=('x86_64' 'aarch64')
-url='https://git.rustybever.be/vieter/vieter'
-license=('AGPL3')
-source=("$pkgname::git+https://git.rustybever.be/vieter/vieter#branch=dev")
-md5sums=('SKIP')
-provides=('vieter')
-conflicts=('vieter')
-
-pkgver() {
-    cd "$pkgname"
-
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-build() {
-    cd "$pkgname"
-
-    make prod
-}
-
-package() {
-    pkgdesc="Vieter is a lightweight implementation of an Arch repository server."
-
-    install -dm755 "$pkgdir/usr/bin"
-    install -Dm755 "$pkgname/pvieter" "$pkgdir/usr/bin/vieter"
-}

README.md

@@ -55,13 +55,3 @@ clone my compiler in the `v` directory & build it. Afterwards, you can use this
 compiler with make by prepending all make commands with `V_PATH=v/v`. If you do
 encounter this issue, please let me know so I can update my mirror & the
 codebase to fix it!
-
-## Contributing
-
-If you wish to contribute to the project, please take note of the following:
-
-* Rebase instead of merging whenever possible, e.g. when updating your branch
-  with the dev branch.
-* Please follow the
-  [Conventional Commits](https://www.conventionalcommits.org/) style for your
-  commit messages.