Commit in vector/trunk (PKGBUILD)

[Justin Kromlinger]

    Date: Tuesday, November 1, 2022 @ 17:18:03
  Author: hashworks
Revision: 1340214

Re-add check() by backing up release build

Modified:
  vector/trunk/PKGBUILD

----------+
 PKGBUILD |   41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-11-01 17:15:25 UTC (rev 1340213)
+++ PKGBUILD    2022-11-01 17:18:03 UTC (rev 1340214)
@@ -25,9 +25,9 @@
     "perl"
     "cmake"
 )
-#checkdepends=(
-#    "cargo-nextest"
-#)
+checkdepends=(
+    "cargo-nextest"
+)
 source=(
     
"${pkgname}-${pkgver}.tar.gz::https://github.com/vectordotdev/vector/archive/refs/tags/v${pkgver}.tar.gz";
     "${pkgname}.sysusers"
@@ -51,24 +51,27 @@
         --release \
         --locked \
         --target "${_target}"
+
+    # Since cargo nextest drops our release build, we need to back it up
+    cp -r target/${_target}/release releasebuild
 }
 
-# TODO: Fix. This throws away our release build and replaces it with a test 
build…
-#check() {
-#    cd "${pkgname}-${pkgver}"
-#    # Unit-Tests only, integration tests require services
-#    cargo nextest run \
-#        --workspace \
-#        --fail-fast \
-#        --test-threads num-cpus \
-#        --frozen \
-#        --release \
-#        --locked \
-#        --offline \
-#        --no-default-features \
-#        --target "${_target}"
-#}
+check() {
+    cd "${pkgname}-${pkgver}"
 
+    # Unit-Tests only, integration tests require services
+    cargo nextest run \
+        --workspace \
+        --fail-fast \
+        --test-threads num-cpus \
+        --frozen \
+        --release \
+        --locked \
+        --offline \
+        --no-default-features \
+        --target "${_target}"
+}
+
 package() {
     install -Dm644 "${pkgname}.sysusers" 
"${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
     install -Dm644 "${pkgname}.tmpfiles" 
"${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
@@ -85,7 +88,7 @@
     install -Dm644 "README.md" "${pkgdir}/usr/share/doc/${pkgname}/RELEASES.md"
     install -Dm644 "README.md" 
"${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md"
 
-    install -Dm755 "target/${_target}/release/vector" 
"${pkgdir}/usr/bin/vector"
+    install -Dm755 "releasebuild/vector" "${pkgdir}/usr/bin/vector"
 
     install -Dm644 "config/vector.toml" "${pkgdir}/etc/vector/vector.toml"
     install -Dm644 "config/agent/vector.yaml" 
"${pkgdir}/etc/vector/agent/vector.yaml"