Merge pull request 'CI: Use generic runner label 'gentoo'' (#15 ) from feature/switch-ci-to-generic-gentoo-runner-labels into master

Reviewed-on: #15
port to meson cargo
2025-12-24 11:18:42 -06:00 · 2025-12-22 08:05:20 +00:00 · 2025-12-21 14:10:17 -06:00
6 changed files with 29 additions and 10 deletions
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -2,8 +2,6 @@ FROM gentoo/stage3:latest

 COPY ./. /

-ENV EGIT_CLONE_TYPE=shallow
-
 RUN getuto

 RUN emerge-webrsync
@@ -16,7 +14,6 @@ RUN emerge \
    sys-process/parallel \
    net-libs/nodejs

-
 RUN git clone https://jturnerusa.dev/cgit/ebuilds/ /var/db/repos/spawns

 COPY etc/portage/repos.conf /etc/portage/
--- a/.docker/etc/portage/package.accept_keywords/jturnerusa
+++ b/.docker/etc/portage/package.accept_keywords/jturnerusa
@@ -0,0 +1 @@
+sec-keys/jturnerusa
--- a/.gitea/workflows/gentoo-utils.yml
+++ b/.gitea/workflows/gentoo-utils.yml
@@ -89,7 +89,7 @@ jobs:
      image_tag: ${{ steps.image-changes.outputs.image_tag }}

  build:
-    runs-on: brutalisk
+    runs-on: gentoo
    env:
      CC: 'clang'
      CXX: 'clang++'
@@ -108,7 +108,7 @@ jobs:
  # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
  # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
  test:
-    runs-on: brutalisk
+    runs-on: gentoo
    env:
      CC: 'clang'
      CXX: 'clang++'
@@ -126,7 +126,7 @@ jobs:
          ninja test -C build

  fuzz:
-    runs-on: brutalisk
+    runs-on: gentoo
    env:
      CC: 'clang'
      CXX: 'clang++'
@@ -158,7 +158,7 @@ jobs:
        continue-on-error: true

  check-format:
-    runs-on: brutalisk
+    runs-on: gentoo
    needs: [build-oci-image]
    container:
      image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -173,7 +173,7 @@ jobs:
          ninja rustfmt -C build

  docs:
-    runs-on: brutalisk
+    runs-on: gentoo
    needs: [build-oci-image]
    container:
      image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -187,7 +187,7 @@ jobs:
          ninja rustdoc -C docs

  grep:
-    runs-on: brutalisk
+    runs-on: gentoo
    needs: [build-oci-image]
    container:
      image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 /subprojects
 !/subprojects
 /subprojects/*
-!/subprojects/packagefiles
+!/subprojects/packagefiles
+!/subprojects/*.wrap
--- a/subprojects/thiserror-2-rs.wrap
+++ b/subprojects/thiserror-2-rs.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = thiserror-2.0.17
+source_url = https://crates.io/api/v1/crates/thiserror/2.0.17/download
+source_filename = thiserror-2.0.17.tar.gz
+source_hash = f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8
+method = cargo
+diff_files = thiserror-2.0.17-include.patch
+
+# bump this version number on every change to meson.build or the patches:
+# v2
--- a/subprojects/thiserror-impl-2-rs.wrap
+++ b/subprojects/thiserror-impl-2-rs.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = thiserror-impl-2.0.17
+source_url = https://crates.io/api/v1/crates/thiserror-impl/2.0.17/download
+source_filename = thiserror-impl-2.0.17.tar.gz
+source_hash = 3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913
+method = cargo
+diff_files = thiserror-impl-2.0.17-include.patch
+
+# bump this version number on every change to meson.build or the patches:
+# v2
Author	SHA1	Message	Date
John Turner	db68959c73	Merge pull request 'CI: Use generic runner label 'gentoo'' (#15 ) from feature/switch-ci-to-generic-gentoo-runner-labels into master All checks were successful Gentoo Utils / build-oci-image (push) Successful in 10s Details Gentoo Utils / docs (push) Successful in 18s Details Gentoo Utils / build (push) Successful in 26s Details Gentoo Utils / fuzz (push) Successful in 1m23s Details Gentoo Utils / grep (push) Successful in 1m56s Details Gentoo Utils / check-format (push) Successful in 2m5s Details Gentoo Utils / test (push) Successful in 1m59s Details Reviewed-on: #15	2025-12-24 11:18:42 -06:00
John Turner	96708614ba	port to meson cargo All checks were successful Gentoo Utils / build-oci-image (push) Successful in 22s Details Gentoo Utils / grep (push) Successful in 1m1s Details Gentoo Utils / check-format (push) Successful in 1m26s Details Gentoo Utils / docs (push) Successful in 1m31s Details Gentoo Utils / build (push) Successful in 1m43s Details Gentoo Utils / test (push) Successful in 36s Details Gentoo Utils / fuzz (push) Successful in 1m21s Details Use the new unstable meson cargo support. This simplifies the meson.build script and allows to use crates such as clap that require picking up features from Cargo.toml. This also allows us to not embed thiserror in subprojects, and instead use a wrap file with a custom meson.build and some patches to make it compile without running its build.rs script.	2025-12-22 08:05:20 +00:00
penguin	7969a0d8c0	ci: use generic label 'gentoo' which maps to any runner capable of running gentoo jobs All checks were successful Gentoo Utils / docs (push) Successful in 16s Details Gentoo Utils / fuzz (push) Successful in 1m12s Details Gentoo Utils / build-oci-image (push) Successful in 10s Details Gentoo Utils / grep (push) Successful in 4s Details Gentoo Utils / check-format (push) Successful in 10s Details Gentoo Utils / build (push) Successful in 22s Details Gentoo Utils / test (push) Successful in 37s Details	2025-12-21 14:10:17 -06:00