public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "sin-ack" <sin-ack@protonmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-admin/opentofu/
Date: Fri, 12 Jan 2024 18:28:45 +0000 (UTC)	[thread overview]
Message-ID: <1705084057.ee6141d1d83aae89d87acd156c5d9145da6dafc7.sin-ack@gentoo> (raw)

commit:     ee6141d1d83aae89d87acd156c5d9145da6dafc7
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Fri Jan 12 18:27:37 2024 +0000
Commit:     sin-ack <sin-ack <AT> protonmail <DOT> com>
CommitDate: Fri Jan 12 18:27:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ee6141d1

app-admin/opentofu: add 1.6.0, drop 1.6.0_rc1

Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>

 app-admin/opentofu/Manifest                                         | 4 ++--
 .../opentofu/{opentofu-1.6.0_rc1.ebuild => opentofu-1.6.0.ebuild}   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-admin/opentofu/Manifest b/app-admin/opentofu/Manifest
index 39ef76f21b..1db6055080 100644
--- a/app-admin/opentofu/Manifest
+++ b/app-admin/opentofu/Manifest
@@ -1,2 +1,2 @@
-DIST opentofu-1.6.0_rc1.tar.gz 3697569 BLAKE2B c29ce1ccfb191b6b48796dbf99f54357ae3caf6703b82b296da3bdb7735c11075c399730b2643321ddf61cff3fdff33c47e2813969e898dd95169db444e7641d SHA512 2f4021e6d77eac238c3a158ade17a2c388ad27f48e85a2a47480a3be5648f9470ba42d23b131308dd4dd9c45f7e8322df195d682356cd40969f0d45d6bfa91ca
-DIST opentofu-v1.6.0-rc1-vendor.tar.gz 15873243 BLAKE2B 07fbc0857c539dd6aa43927b2be6799a4842e9cbf3a8ff34145a516d803772a55a9520128c45d69a16b89303515bc03d9cc450d154a45d486542b7dc855c1999 SHA512 568c386ad9178f9d1bdbe5d9bb18efb149ab58ca2b50bacab228c0419d61a55fbf265229c97980920ac837c4f0ccedb378fdcf7e2d8219622990812cd6863fde
+DIST opentofu-1.6.0.tar.gz 3696642 BLAKE2B e224ce14f04d07638d03b9a11ab251cd820acc86774f9c82f38f5bcfc38b62bbdbc70377e722a4dd2bd65f917ba0fc200ccaaeafdbd9430af66586491c7627eb SHA512 758f4ff79e526e9494e1e98dd927dbeb803b45df1f8bc15c3a9bca8343d7285b9130bfe5f19f6ddd7fd403b72d852b0d51542c058174e4bd5eed3c729b394bdb
+DIST opentofu-v1.6.0-vendor.tar.xz 8696980 BLAKE2B 44556df2bdbabaa3ad9f0e60a7e58ab65dd9dd5056abde87afe0cb0cc41c68bb48c67a69c3c48e8bb6b9b1419de9756ad68439dde8b75dbd7b44d0bf8e7868c0 SHA512 8c73002c2bb9e31ab7ce43aa62756b6d7df6575d2983fae7c2760aa2f1e9e241fa84c1103759daf121cecd002d12de4970dc7fa8586a1c2dd7e6e7a88dcfeee1

diff --git a/app-admin/opentofu/opentofu-1.6.0_rc1.ebuild b/app-admin/opentofu/opentofu-1.6.0.ebuild
similarity index 76%
rename from app-admin/opentofu/opentofu-1.6.0_rc1.ebuild
rename to app-admin/opentofu/opentofu-1.6.0.ebuild
index 6a2b3f9576..a75905927b 100644
--- a/app-admin/opentofu/opentofu-1.6.0_rc1.ebuild
+++ b/app-admin/opentofu/opentofu-1.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://opentofu.org/"
 MY_PV="${PV/_rc/-rc}"
 S="${WORKDIR}/${PN}-${MY_PV}"
 SRC_URI="https://github.com/opentofu/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/sin-ack/opentofu-vendor/releases/download/v${MY_PV}/opentofu-v${MY_PV}-vendor.tar.gz"
+	https://github.com/sin-ack/opentofu-vendor/releases/download/v${MY_PV}/opentofu-v${MY_PV}-vendor.tar.xz"
 
 # Main package is MPL-2.0. The rest is obtained with `go-licenses csv ./cmd/tofu'
 LICENSE="MPL-2.0 Apache-2.0 BSD-2 ISC MIT"
@@ -25,10 +25,14 @@ DOCS=( {README,CHANGELOG}.md )
 
 src_compile() {
 	export CGO_ENABLED=0
+	# The -ldflags argument is required to prevent opentofu from displaying
+	# -dev at the end of version strings:
+	# https://github.com/opentofu/opentofu/blob/main/BUILDING.md#dev-version-reporting
 	gox \
 		-os=$(go env GOOS) \
 		-arch=$(go env GOARCH) \
 		-output bin/tofu \
+		-ldflags "-w -s -X 'github.com/opentofu/opentofu/version.dev=no'" \
 		-verbose \
 		./cmd/tofu || die
 }


             reply	other threads:[~2024-01-12 18:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-12 18:28 sin-ack [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-23 16:52 [gentoo-commits] repo/proj/guru:dev commit in: app-admin/opentofu/ Anna Vyalkova
2023-12-26 16:47 sin-ack
2023-12-26 16:47 sin-ack
2023-12-26 16:41 sin-ack

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1705084057.ee6141d1d83aae89d87acd156c5d9145da6dafc7.sin-ack@gentoo \
    --to=sin-ack@protonmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox