public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Julien Roy" <julien@jroy.ca>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: app-containers/pods/, app-containers/pods/files/
Date: Wed, 20 Mar 2024 11:46:34 +0000 (UTC)	[thread overview]
Message-ID: <1710935010.2870371aaf263af66bd8232e93b685fdefb96502.julien@gentoo> (raw)

commit:     2870371aaf263af66bd8232e93b685fdefb96502
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Wed Mar 20 11:43:30 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed Mar 20 11:43:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2870371a

app-containers/pods: drop clippy/lint test

Closes: https://bugs.gentoo.org/927324
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 .../pods/files/disable-clippy-test-2.1.0.patch     | 25 ++++++++++++++++++++++
 .../pods/pods-2.1.0_pre20240215-r3.ebuild          |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/app-containers/pods/files/disable-clippy-test-2.1.0.patch b/app-containers/pods/files/disable-clippy-test-2.1.0.patch
new file mode 100644
index 0000000000..913c1d9cec
--- /dev/null
+++ b/app-containers/pods/files/disable-clippy-test-2.1.0.patch
@@ -0,0 +1,25 @@
+diff --git a/src/meson.build b/src/meson.build
+index 776f6c1e..83c7db3c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -65,20 +65,3 @@ cargo = find_program('cargo', required: true)
+ cargo_target_dir = meson.project_build_root() / 'target'
+ cargo_home = meson.project_build_root() / 'cargo-home'
+ manifest_path = meson.project_source_root() / 'Cargo.toml'
+-test (
+-  'clippy',
+-  cargo,
+-  args: [
+-    'clippy',
+-    '--manifest-path=@0@'.format(manifest_path),
+-    '--target-dir=@0@'.format(cargo_target_dir),
+-    '--',
+-    '-D',
+-    'warnings',
+-  ],
+-  env: [
+-    'CARGO_HOME=@0@'.format(cargo_home),
+-    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin',
+-  ],
+-  timeout: 300, # Give cargo more time
+-)

diff --git a/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild b/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
index bceadfe445..36eef2ebf7 100644
--- a/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
+++ b/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
@@ -361,6 +361,10 @@ BDEPEND="
 # Rust
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/disable-clippy-test-2.1.0.patch
+)
+
 src_configure() {
 	meson_src_configure
 	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die


WARNING: multiple messages have this Message-ID (diff)
From: "Julien Roy" <julien@jroy.ca>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-containers/pods/, app-containers/pods/files/
Date: Wed, 20 Mar 2024 11:43:51 +0000 (UTC)	[thread overview]
Message-ID: <1710935010.2870371aaf263af66bd8232e93b685fdefb96502.julien@gentoo> (raw)
Message-ID: <20240320114351.iOSRLURZZ6vcWneAO_yJ9dHmGETR1O5sUO6lj9Cz2dw@z> (raw)

commit:     2870371aaf263af66bd8232e93b685fdefb96502
Author:     Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Wed Mar 20 11:43:30 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed Mar 20 11:43:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2870371a

app-containers/pods: drop clippy/lint test

Closes: https://bugs.gentoo.org/927324
Signed-off-by: Julien Roy <julien <AT> jroy.ca>

 .../pods/files/disable-clippy-test-2.1.0.patch     | 25 ++++++++++++++++++++++
 .../pods/pods-2.1.0_pre20240215-r3.ebuild          |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/app-containers/pods/files/disable-clippy-test-2.1.0.patch b/app-containers/pods/files/disable-clippy-test-2.1.0.patch
new file mode 100644
index 0000000000..913c1d9cec
--- /dev/null
+++ b/app-containers/pods/files/disable-clippy-test-2.1.0.patch
@@ -0,0 +1,25 @@
+diff --git a/src/meson.build b/src/meson.build
+index 776f6c1e..83c7db3c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -65,20 +65,3 @@ cargo = find_program('cargo', required: true)
+ cargo_target_dir = meson.project_build_root() / 'target'
+ cargo_home = meson.project_build_root() / 'cargo-home'
+ manifest_path = meson.project_source_root() / 'Cargo.toml'
+-test (
+-  'clippy',
+-  cargo,
+-  args: [
+-    'clippy',
+-    '--manifest-path=@0@'.format(manifest_path),
+-    '--target-dir=@0@'.format(cargo_target_dir),
+-    '--',
+-    '-D',
+-    'warnings',
+-  ],
+-  env: [
+-    'CARGO_HOME=@0@'.format(cargo_home),
+-    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin',
+-  ],
+-  timeout: 300, # Give cargo more time
+-)

diff --git a/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild b/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
index bceadfe445..36eef2ebf7 100644
--- a/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
+++ b/app-containers/pods/pods-2.1.0_pre20240215-r3.ebuild
@@ -361,6 +361,10 @@ BDEPEND="
 # Rust
 QA_FLAGS_IGNORED="usr/bin/${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/disable-clippy-test-2.1.0.patch
+)
+
 src_configure() {
 	meson_src_configure
 	ln -s "${CARGO_HOME}" "${BUILD_DIR}/cargo-home" || die


             reply	other threads:[~2024-03-20 11:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-20 11:46 Julien Roy [this message]
2024-03-20 11:43 ` [gentoo-commits] repo/proj/guru:dev commit in: app-containers/pods/, app-containers/pods/files/ Julien Roy
  -- strict thread matches above, loose matches on Subject: below --
2025-01-02 19:26 [gentoo-commits] repo/proj/guru:master " David Roman

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=1710935010.2870371aaf263af66bd8232e93b685fdefb96502.julien@gentoo \
    --to=julien@jroy.ca \
    --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