From 0508c998ef5cb7ba3febc796f09f44d15fd7e739 Mon Sep 17 00:00:00 2001 From: madonuko Date: Mon, 8 Jun 2026 18:03:03 +0800 Subject: [PATCH 1/7] fix(ci/bootstrap): update buildsys dir path --- .github/workflows/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 3cd41b371f7..aed2f67b33d 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -37,11 +37,11 @@ jobs: dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm - name: Install build dependencies - run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec + run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/buildsys/{anda,subatomic}/*.spec - name: Install Anda run: | - rpmbuild -bb anda/tools/buildsys/anda/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/tools/buildsys/anda/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/" + rpmbuild -bb anda/buildsys/anda/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/buildsys/anda/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/" mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/ dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm @@ -61,7 +61,7 @@ jobs: run: anda build -D "vendor Terra" -D "__python %{__python3}" -rrpmbuild anda/terra/appstream-helper/pkg - name: Build Subatomic - run: anda build -D "vendor Terra" -rrpmbuild anda/tools/buildsys/subatomic/pkg + run: anda build -D "vendor Terra" -rrpmbuild anda/buildsys/subatomic/pkg - name: Install Subatomic run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm From 462b61e7f2f4dac5e1fc98510de556ca38d72af4 Mon Sep 17 00:00:00 2001 From: madonuko Date: Thu, 11 Jun 2026 14:24:22 +0800 Subject: [PATCH 2/7] mew --- .github/workflows/bootstrap.yml | 9 +++++++++ .github/workflows/scorecard.yml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 12a610ce3ea..e21cb767aac 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -29,6 +29,15 @@ jobs: ref: f${{ matrix.version }} fetch-depth: 1 + - name: Setup build environment + run: | + sed -i 's/.fc%{fedora}/.fcrawhide/g' /usr/lib/rpm/macros.d/macros.dist + cat<> /etc/dnf/dnf.conf + gpgcheck=1 + install_weak_deps=0 + max_parallel_downloads=20 + EOF + - name: Build anda-srpm-macros run: | mkdir -p anda-build/rpm/rpms diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 841111c196b..039ff7772bb 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard (optional). # Commenting out will disable upload of results to your repo's Code Scanning dashboard - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4 + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: results.sarif From d3b3f1a592997e48238813bc559c859338ef74a7 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 12 Jun 2026 14:06:32 +0800 Subject: [PATCH 3/7] revert the funny downgraded Signed-off-by: madomado --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 039ff7772bb..841111c196b 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -73,6 +73,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard (optional). # Commenting out will disable upload of results to your repo's Code Scanning dashboard - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + uses: github/codeql-action/upload-sarif@87557b9c84dde89fdd9b10e88954ac2f4248e463 # v4 with: sarif_file: results.sarif From 8e81ac1106a4e7d3a6c6e7284f9f2dd3393da782 Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 14 Jun 2026 23:29:15 +0800 Subject: [PATCH 4/7] feat(ci/bootstrap): add terra-sccache --- .github/workflows/bootstrap.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index e21cb767aac..6ea8b33d168 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -46,7 +46,7 @@ jobs: dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm - name: Install build dependencies - run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros,appstream-helper}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec + run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros,appstream-helper,sccache}/*.spec anda/{buildsys/anda,tools/subatomic}/*.spec - name: Install Anda run: | @@ -69,6 +69,9 @@ jobs: - name: Build terra-appstream-helper run: anda build -D "vendor Terra" -D "__python %{__python3}" -rrpmbuild anda/terra/appstream-helper/pkg + - name: Build terra-sccache + run: anda build -D "vendor Terra" -rrpmbuild anda/terra/sccache/pkg + - name: Build Subatomic run: anda build -D "vendor Terra" -rrpmbuild anda/tools/subatomic/pkg - name: Install Subatomic From 5f1bfbe1fe5179feb25b6fc9b6fbb2d48d7bb7af Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 14 Jun 2026 23:43:40 +0800 Subject: [PATCH 5/7] fix(sccache): %crates_source --- anda/terra/sccache/terra-sccache.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/terra/sccache/terra-sccache.spec b/anda/terra/sccache/terra-sccache.spec index c2217f2bf53..7e5464c64ac 100644 --- a/anda/terra/sccache/terra-sccache.spec +++ b/anda/terra/sccache/terra-sccache.spec @@ -14,7 +14,7 @@ Summary: Remote caching enabled builds of sccache SourceLicense: Apache-2.0 AND (Apache-2.0 OR MIT) License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CDLA-Permissive-2.0 AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) URL: https://crates.io/crates/sccache -Source0: %{crates_source} +Source0: https://static.crates.io/crates/sccache/sccache-%version.crate BuildRequires: anda-srpm-macros BuildRequires: cargo BuildRequires: cargo-rpm-macros From d4618c1c0fc056dcca50897d33946cb708b18c0a Mon Sep 17 00:00:00 2001 From: madonuko Date: Sun, 14 Jun 2026 23:56:04 +0800 Subject: [PATCH 6/7] fix(sccache): try defining %crates_source directly instead --- anda/terra/sccache/terra-sccache.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/anda/terra/sccache/terra-sccache.spec b/anda/terra/sccache/terra-sccache.spec index 7e5464c64ac..893bdbed905 100644 --- a/anda/terra/sccache/terra-sccache.spec +++ b/anda/terra/sccache/terra-sccache.spec @@ -7,6 +7,8 @@ options, or alternatively, in local storage. This build actually enables caching to remote storage.} %bcond dist %["%{_target_cpu}" == "x86_64"] +%global crates_source https://static.crates.io/crates/sccache/sccache-%version.crate + Name: terra-sccache Version: 0.15.0 Release: 1%{?dist} @@ -14,7 +16,7 @@ Summary: Remote caching enabled builds of sccache SourceLicense: Apache-2.0 AND (Apache-2.0 OR MIT) License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CDLA-Permissive-2.0 AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) URL: https://crates.io/crates/sccache -Source0: https://static.crates.io/crates/sccache/sccache-%version.crate +Source0: %{crates_source} BuildRequires: anda-srpm-macros BuildRequires: cargo BuildRequires: cargo-rpm-macros From 6b93d250a69b9c84ca1814eff82d00c451545e87 Mon Sep 17 00:00:00 2001 From: madonuko Date: Mon, 15 Jun 2026 00:09:59 +0800 Subject: [PATCH 7/7] fix(ci/bootstrap): use current branch ref --- .github/workflows/bootstrap.yml | 1 - anda/terra/sccache/terra-sccache.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 6ea8b33d168..95ec8de04ab 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -26,7 +26,6 @@ jobs: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: - ref: f${{ matrix.version }} fetch-depth: 1 - name: Setup build environment diff --git a/anda/terra/sccache/terra-sccache.spec b/anda/terra/sccache/terra-sccache.spec index 893bdbed905..36a3ad116fa 100644 --- a/anda/terra/sccache/terra-sccache.spec +++ b/anda/terra/sccache/terra-sccache.spec @@ -16,7 +16,7 @@ Summary: Remote caching enabled builds of sccache SourceLicense: Apache-2.0 AND (Apache-2.0 OR MIT) License: ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND (MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 AND ISC) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND BSD-3-Clause AND (CC0-1.0 OR Apache-2.0 OR Apache-2.0 WITH LLVM-exception) AND (CC0-1.0 OR MIT-0 OR Apache-2.0) AND CDLA-Permissive-2.0 AND ISC AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Apache-2.0 OR LGPL-2.1-or-later) AND (MIT OR Apache-2.0 OR Zlib) AND (MIT OR Zlib OR Apache-2.0) AND MPL-2.0 AND (Unlicense OR MIT) AND Zlib AND (Zlib OR Apache-2.0 OR MIT) URL: https://crates.io/crates/sccache -Source0: %{crates_source} +Source0: https://static.crates.io/crates/sccache/sccache-%version.crate BuildRequires: anda-srpm-macros BuildRequires: cargo BuildRequires: cargo-rpm-macros