diff --git a/.SRCINFO b/.SRCINFO index bc25d0d..f5e77fa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = vlang pkgdesc = Simple, fast, safe, compiled language for developing maintainable software - pkgver = 0.3.0 + pkgver = 0.3.2 pkgrel = 1 url = https://vlang.io arch = x86_64 @@ -12,11 +12,11 @@ pkgbase = vlang optdepends = freetype2: Needed for graphics support optdepends = openssl: Needed for http support conflicts = v - conflicts = vlang-bin - conflicts = vlang-git - source = v-ec758604538c00cceb142d324609a241e665f7c7.zip::https://github.com/vlang/v/archive/ec758604538c00cceb142d324609a241e665f7c7.zip - source = vc-5dc8384638f515a098f75296fa7123c5e6a4964a.zip::https://github.com/vlang/vc/archive/5dc8384638f515a098f75296fa7123c5e6a4964a.zip - sha256sums = 46e4a7893c475ab17bf7b1e596bd2be2608169b8a3d74b2910f12a1ed8a32d4a - sha256sums = 570e64a76c848b8575ec286b9b23d788a97dc4d23ba029cba5e987bbcce41a6b + source = v-0.3.2.zip::https://github.com/vlang/v/archive/135b1ccb14699a458575f1d63aa8d1cd4afa3b7a.zip + source = vc-0.3.2.zip::https://github.com/vlang/vc/archive/f96a25aee506a6025d716c8520c0a492374081c6.zip + sha256sums = 8f89d92798ca2b8e6f95da107c9db3ce583540672f019056ca97affe9b38e2ff + sha256sums = 4dc9fe1a09295f2534c5e884aa4d2fc5fd80c2a1792f4247f414ba2e0ecf8d0f + sha512sums = 69bb66446a71abed2f47bb4790a62e700f39f8bc3adf7f8ae0fbf00b70857d4147cbaeaef50843cb708dfeedffc34392d347675b165c70508956ae9c2f5eacef + sha512sums = 1037f9f23b84b6c9028a6d1ddb5c200d8a665d5ee5912bb6e8fbf73887fb3792227c5451aec633bfc1b44f7e670cf0fca1a24c173b7c2c3faccd27f6dbb8b40f pkgname = vlang diff --git a/.woodpecker.yml b/.woodpecker.yml index 7362f74..fc7cec5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,8 +8,9 @@ branches: ['master'] pipeline: build: - image: 'menci/archlinuxarm:base-devel' + image: 'git.rustybever.be/vieter-v/vieter-builder' commands: + - 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 diff --git a/PKGBUILD b/PKGBUILD index dcc8935..a4e9845 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,12 +1,14 @@ # Maintainer: Jef Roosens # Contributor: Logan Magee -# Commit hashes of 0.3 release in v & vc repositories -_v_commit_sha=ec758604538c00cceb142d324609a241e665f7c7 -_vc_commit_sha=5dc8384638f515a098f75296fa7123c5e6a4964a +# Commit hashes for the latest release in the v & vc repositories +# Using the direct downloads for the commits greatly reduces the time needed to +# pull down the sources, as the vlang repository is >100MB. +_v_commit_sha=135b1ccb14699a458575f1d63aa8d1cd4afa3b7a +_vc_commit_sha=f96a25aee506a6025d716c8520c0a492374081c6 pkgname=vlang -pkgver=0.3.0 +pkgver=0.3.2 pkgrel=1 pkgdesc='Simple, fast, safe, compiled language for developing maintainable software' arch=('x86_64' 'aarch64') @@ -17,13 +19,18 @@ optdepends=('glfw: Needed for graphics support' 'freetype2: Needed for graphics support' 'openssl: Needed for http support') makedepends=('git') -conflicts=('v' 'vlang-bin' 'vlang-git') -source=("v-${_v_commit_sha}.zip::https://github.com/vlang/v/archive/${_v_commit_sha}.zip" - "vc-${_vc_commit_sha}.zip::https://github.com/vlang/vc/archive/${_vc_commit_sha}.zip") -sha256sums=('46e4a7893c475ab17bf7b1e596bd2be2608169b8a3d74b2910f12a1ed8a32d4a' - '570e64a76c848b8575ec286b9b23d788a97dc4d23ba029cba5e987bbcce41a6b') +conflicts=('v') +source=("v-${pkgver}.zip::https://github.com/vlang/v/archive/${_v_commit_sha}.zip" + "vc-${pkgver}.zip::https://github.com/vlang/vc/archive/${_vc_commit_sha}.zip") +sha256sums=('8f89d92798ca2b8e6f95da107c9db3ce583540672f019056ca97affe9b38e2ff' + '4dc9fe1a09295f2534c5e884aa4d2fc5fd80c2a1792f4247f414ba2e0ecf8d0f') +sha512sums=('69bb66446a71abed2f47bb4790a62e700f39f8bc3adf7f8ae0fbf00b70857d4147cbaeaef50843cb708dfeedffc34392d347675b165c70508956ae9c2f5eacef' + '1037f9f23b84b6c9028a6d1ddb5c200d8a665d5ee5912bb6e8fbf73887fb3792227c5451aec633bfc1b44f7e670cf0fca1a24c173b7c2c3faccd27f6dbb8b40f') prepare() { + # In case the previous directory still exists + rm -rf "v-${_v_commit_sha}/vc" + mv "vc-${_vc_commit_sha}" "v-${_v_commit_sha}/vc" # We have to set local=1 because we manually download a specific vc