1 Commits

Author SHA1 Message Date
10756b4f61 port to meson cargo
Some checks failed
Gentoo Utils / build (push) Has been cancelled
Gentoo Utils / test (push) Has been cancelled
Gentoo Utils / fuzz (push) Has been cancelled
Gentoo Utils / build-oci-image (push) Has been cancelled
Gentoo Utils / check-format (push) Has been cancelled
Gentoo Utils / docs (push) Has been cancelled
Gentoo Utils / grep (push) Has been cancelled
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:03:02 +00:00
2 changed files with 7 additions and 8 deletions

View File

@@ -89,7 +89,7 @@ jobs:
image_tag: ${{ steps.image-changes.outputs.image_tag }} image_tag: ${{ steps.image-changes.outputs.image_tag }}
build: build:
runs-on: gentoo runs-on: brutalisk
env: env:
CC: 'clang' CC: 'clang'
CXX: '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 # 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 # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
test: test:
runs-on: gentoo runs-on: brutalisk
env: env:
CC: 'clang' CC: 'clang'
CXX: 'clang++' CXX: 'clang++'
@@ -126,7 +126,7 @@ jobs:
ninja test -C build ninja test -C build
fuzz: fuzz:
runs-on: gentoo runs-on: brutalisk
env: env:
CC: 'clang' CC: 'clang'
CXX: 'clang++' CXX: 'clang++'
@@ -158,7 +158,7 @@ jobs:
continue-on-error: true continue-on-error: true
check-format: check-format:
runs-on: gentoo runs-on: brutalisk
needs: [build-oci-image] needs: [build-oci-image]
container: container:
image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }} image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -173,7 +173,7 @@ jobs:
ninja rustfmt -C build ninja rustfmt -C build
docs: docs:
runs-on: gentoo runs-on: brutalisk
needs: [build-oci-image] needs: [build-oci-image]
container: container:
image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }} image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -187,7 +187,7 @@ jobs:
ninja rustdoc -C docs ninja rustdoc -C docs
grep: grep:
runs-on: gentoo runs-on: brutalisk
needs: [build-oci-image] needs: [build-oci-image]
container: container:
image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }} image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}

View File

@@ -6,5 +6,4 @@ edition = "2024"
[dependencies] [dependencies]
mon = { git = "https://jturnerusa.dev/cgit/mon/", rev = "67861a4df8a5abdd70651d47cf265b20c41d2acc" } mon = { git = "https://jturnerusa.dev/cgit/mon/", rev = "67861a4df8a5abdd70651d47cf265b20c41d2acc" }
get = { git = "https://jturnerusa.dev/cgit/get/", rev = "cd5f75b65777a855ab010c3137304ac05f2e56b8" } get = { git = "https://jturnerusa.dev/cgit/get/", rev = "cd5f75b65777a855ab010c3137304ac05f2e56b8" }
itertools = "0.14.0" itertools = "0.14.0"
thiserror = { version = "2.0.17", features = ["derive"] }