diff --git a/.woodpecker/.arch-rel.yml b/.woodpecker/.arch-rel.yml index 52f9f03..b8f4c7a 100644 --- a/.woodpecker/.arch-rel.yml +++ b/.woodpecker/.arch-rel.yml @@ -12,7 +12,7 @@ pipeline: image: 'menci/archlinuxarm:base-devel' commands: # Add the vieter repository so we can use the compiler - - echo -e '[vieter-dev]\nServer = https://arch.r8r.be/$repo/$arch\nSigLevel = Optional' >> /etc/pacman.conf + - 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 @@ -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 -OL https://git.rustybever.be/vieter/vieter/raw/tag/$CI_COMMIT_TAG/PKGBUILD" + - curl -OL "https://git.rustybever.be/vieter/vieter/raw/tag/$CI_COMMIT_TAG/PKGBUILD" - makepkg -s --noconfirm --needed when: event: tag diff --git a/.woodpecker/.arch.yml b/.woodpecker/.arch.yml index 5593c8f..b2a59ba 100644 --- a/.woodpecker/.arch.yml +++ b/.woodpecker/.arch.yml @@ -12,7 +12,7 @@ pipeline: image: 'menci/archlinuxarm:base-devel' commands: # Add the vieter repository so we can use the compiler - - echo -e '[vieter-dev]\nServer = https://arch.r8r.be/$repo/$arch\nSigLevel = Optional' >> /etc/pacman.conf + - 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 @@ -32,7 +32,7 @@ pipeline: 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-dev/publish; done' + - '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: diff --git a/CHANGELOG.md b/CHANGELOG.md index 214cfc2..2e17cd6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * `vieter build` command now only builds a single repository & uploads the build logs -* Official Vieter Arch repo is now split into `vieter` & `vieter-dev` - * `vieter` contains tagged releases of Vieter - * `vieter-dev` contains development releases & packages for the compiler & - VLS +* 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) diff --git a/PKGBUILD.dev b/PKGBUILD.dev index 8e9f6af..d0176d8 100644 --- a/PKGBUILD.dev +++ b/PKGBUILD.dev @@ -12,6 +12,8 @@ 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"