Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] common/build-style/cargo.sh: use --locked for build and check as well
@ 2023-04-03  6:50 jcgruenhage
  2023-04-03  6:59 ` [PR PATCH] [Updated] RFC: " jcgruenhage
                   ` (21 more replies)
  0 siblings, 22 replies; 23+ messages in thread
From: jcgruenhage @ 2023-04-03  6:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1189 bytes --]

There is a new pull request by jcgruenhage against master on the void-packages repository

https://github.com/jcgruenhage/void-packages locked-cargo
https://github.com/void-linux/void-packages/pull/43233

common/build-style/cargo.sh: use --locked for build and check as well
#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43233.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-locked-cargo-43233.patch --]
[-- Type: text/x-diff, Size: 1948 bytes --]

From 0e054635800fe510da231e16c461ee43c3f8f7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sun, 2 Apr 2023 16:25:24 +0200
Subject: [PATCH 1/2] common/build-style/cargo.sh: use --locked for build and
 check as well

---
 common/build-style/cargo.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 387e711060bc..d2f75dddc515 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -5,13 +5,13 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
+	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
+	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} ${configure_args} \
 		${make_check_args}
 }
 

From b19ba795daa927d4bf50c37a622f3e1c478ef0ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 3 Apr 2023 08:49:10 +0200
Subject: [PATCH 2/2] cargo-update: generate lockfile to fix build

---
 srcpkgs/cargo-update/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/cargo-update/template b/srcpkgs/cargo-update/template
index ea2c25272a88..bbbd137af127 100644
--- a/srcpkgs/cargo-update/template
+++ b/srcpkgs/cargo-update/template
@@ -17,6 +17,13 @@ if [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
 	make_check_args="-- --skip ops::assert_index_path"
 fi
 
+post_patch() {
+	# Upstream does not ship a lockfile and is very vocal about that being
+	# the right way:
+	# https://github.com/nabijaczleweli/cargo-update/issues/50
+	cargo generate-lockfile
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md

^ permalink raw reply	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2023-04-13 17:15 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-03  6:50 [PR PATCH] common/build-style/cargo.sh: use --locked for build and check as well jcgruenhage
2023-04-03  6:59 ` [PR PATCH] [Updated] RFC: " jcgruenhage
2023-04-03  9:00 ` stefankreutz
2023-04-03  9:57 ` jcgruenhage
2023-04-03 15:54 ` icp1994
2023-04-03 18:44 ` jcgruenhage
2023-04-03 19:12 ` icp1994
2023-04-04  1:21 ` classabbyamp
2023-04-04  8:43 ` jcgruenhage
2023-04-04  8:44 ` jcgruenhage
2023-04-08 18:11 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-08 18:29 ` jcgruenhage
2023-04-08 18:31 ` jcgruenhage
2023-04-13  5:01 ` classabbyamp
2023-04-13  5:59 ` jcgruenhage
2023-04-13 13:24 ` classabbyamp
2023-04-13 14:21 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-13 14:22 ` jcgruenhage
2023-04-13 14:27 ` jcgruenhage
2023-04-13 14:44 ` [PR PATCH] [Updated] " jcgruenhage
2023-04-13 14:44 ` jcgruenhage
2023-04-13 15:52 ` jcgruenhage
2023-04-13 17:15 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).