From fe3e7aff61acd7b1826741d6cdbdb32b3f518ea7 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 May 2023 09:57:24 +0800 Subject: [PATCH] feat: add group to sccache (#421) * feat: add group to sccache * Update rust-sccache.spec Signed-off-by: madomado * fix: sccache (#428) * fix: switchboard-plug-pantheon-shell elementary-onboarding (#415) * fix: switchboard-plug-pantheon-shell Signed-off-by: madomado * fix: elementary-onboarding Signed-off-by: madomado --------- Signed-off-by: madomado * bump: ruff * bump: iosevka-fusion * add: armcord-bin armcord (#419) * add: armcord-bin armcord * fix: armcord-bin armcord * fix: ~ * fix: ~ * bump: sarasa-gothic * bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly * Create terra-release (#422) * ci: Run actions on merge_group (#423) * ci: Run actions on merge_group * fix: update conditional steps * fix: don't dupe action run for lint * refactor: simplify condition * bump: curlie orjson maturin zoxide * bump: protobuf * bump: crystal * bump: osu-lazer * Add vala-nightly package (#425) * shuffle vala packages into vala subdir * add vala-nightly package * Fix vala-nightly changelog and vls nightly build (#426) * fix change log * fix vls not building * bump: dart * fix: sccache --------- Signed-off-by: madomado Co-authored-by: Raboneko Co-authored-by: lleyton * fix(arch): sccache --------- Signed-off-by: madomado Co-authored-by: Raboneko Co-authored-by: lleyton --- anda/rust/sccache/anda.hcl | 1 + anda/rust/sccache/rust-sccache.spec | 24 +++++-------------- .../sccache/sccache-fix-metadata-auto.diff | 6 ++--- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/anda/rust/sccache/anda.hcl b/anda/rust/sccache/anda.hcl index 665fb9cf1a..a57944ad84 100644 --- a/anda/rust/sccache/anda.hcl +++ b/anda/rust/sccache/anda.hcl @@ -1,4 +1,5 @@ project pkg { + arches = ["x86_64"] rpm { spec = "rust-sccache.spec" } diff --git a/anda/rust/sccache/rust-sccache.spec b/anda/rust/sccache/rust-sccache.spec index a1a7a47e75..59d335f34a 100644 --- a/anda/rust/sccache/rust-sccache.spec +++ b/anda/rust/sccache/rust-sccache.spec @@ -6,11 +6,12 @@ Name: rust-sccache Version: 0.4.2 -Release: 1%{?dist} +Release: %autorelease Summary: Ccache-like tool License: Apache-2.0 URL: https://crates.io/crates/sccache +Group: Development/Languages/Rust Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: sccache-fix-metadata-auto.diff @@ -84,18 +85,6 @@ use the "azure" feature of the "%{crate}" crate. %files -n %{name}+azure-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+crossbeam-utils-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+crossbeam-utils-devel %{_description} - -This package contains library source intended for building other packages which -use the "crossbeam-utils" feature of the "%{crate}" crate. - -%files -n %{name}+crossbeam-utils-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+dist-client-devel Summary: %{summary} BuildArch: noarch @@ -180,16 +169,16 @@ use the "hyper" feature of the "%{crate}" crate. %files -n %{name}+hyper-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+jsonwebtoken-devel +%package -n %{name}+jwt-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+jsonwebtoken-devel %{_description} +%description -n %{name}+jwt-devel %{_description} This package contains library source intended for building other packages which -use the "jsonwebtoken" feature of the "%{crate}" crate. +use the "jwt" feature of the "%{crate}" crate. -%files -n %{name}+jsonwebtoken-devel +%files -n %{name}+jwt-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+libmount-devel @@ -430,7 +419,6 @@ use the "webdav" feature of the "%{crate}" crate. %install %cargo_install -f dist-server - %if %{with check} %check %cargo_test -f dist-server diff --git a/anda/rust/sccache/sccache-fix-metadata-auto.diff b/anda/rust/sccache/sccache-fix-metadata-auto.diff index 25722f92b6..e31b18399e 100644 --- a/anda/rust/sccache/sccache-fix-metadata-auto.diff +++ b/anda/rust/sccache/sccache-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- sccache-0.4.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sccache-0.4.1/Cargo.toml 2023-03-27T14:56:08.411559+00:00 -@@ -358,14 +358,3 @@ +--- sccache-0.4.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sccache-0.4.2/Cargo.toml 2023-05-10T14:25:40.783197+00:00 +@@ -362,14 +362,3 @@ [target."cfg(unix)".dependencies.daemonize] version = "0.5"