boulder-data: Use binary(*) deps instead of named ones

Signed-off-by: Reilly Brogan <[email protected]>
serpent-os · Jan 14, 2025 · 0a484cd · 0a484cd
1 parent ec2ef81
commit 0a484cd
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/boulder/data/macros/actions/cargo.yaml b/boulder/data/macros/actions/cargo.yaml
@@ -14,14 +14,14 @@ actions:
         command: |
             cargo fetch -v --locked
         dependencies:
-            - rust
+            - binary(cargo)
 
     - cargo_build:
         description: Build the rust project
         command: |
             cargo build %(options_cargo_release)
         dependencies:
-            - rust
+            - binary(cargo)
 
     - cargo_install:
         description: Install the built binary
@@ -37,14 +37,14 @@ actions:
             }
             cargo_install
         dependencies:
-            - rust
+            - binary(cargo)
 
     - cargo_test:
         description: Run tests
         command: |
             cargo test %(options_cargo_release) --workspace
         dependencies:
-            - rust
+            - binary(cargo)
 
 definitions:
     # The default cargo build profile

diff --git a/boulder/data/macros/actions/cmake.yaml b/boulder/data/macros/actions/cmake.yaml
@@ -5,36 +5,36 @@ actions:
         command: |
             cmake %(options_cmake)
         dependencies:
-            - cmake
+            - binary(cmake)
 
     - cmake_unity:
         description: Perform cmake with unity build enabled
         command: |
             cmake -DCMAKE_UNITY_BUILD=ON %(options_cmake)
         dependencies:
-            - cmake
+            - binary(cmake)
 
     - cmake_build:
         description: Build the cmake project
         command: |
             ninja -v -j "%(jobs)" -C "%(builddir)"
         dependencies:
-            - ninja
+            - binary(ninja)
 
     - cmake_install:
         description: Install results of the build to the destination directory
         command: |
             DESTDIR="%(installroot)" ninja install -v -j "%(jobs)" -C "%(builddir)"
         dependencies:
-            - ninja
+            - binary(ninja)
 
     - cmake_test:
         description: Run testsuite with ctest
         command: |
             ninja test -v -j "%(jobs)" -C "%(builddir)"
         dependencies:
-            - cmake
-            - ninja
+            - binary(cmake)
+            - binary(ninja)
 
 definitions:
 

diff --git a/boulder/data/macros/actions/meson.yaml b/boulder/data/macros/actions/meson.yaml
@@ -6,40 +6,40 @@ actions:
             test -e ./meson.build || ( echo "%%meson: The ./meson.build script could not be found" ; exit 1 )
             CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" meson setup %(options_meson)
         dependencies:
-            - cmake
-            - meson
-            - pkgconf
+            - binary(cmake)
+            - binary(meson)
+            - binary(pkgconf)
 
     - meson_unity:
         description: Run meson with unity build enabled
         command: |
             test -e ./meson.build || ( echo "%%meson: The ./meson.build script could not be found" ; exit 1 )
             CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" meson setup --unity on %(options_meson)
         dependencies:
-            - cmake
-            - meson
-            - pkgconf
+            - binary(cmake)
+            - binary(meson)
+            - binary(pkgconf)
 
     - meson_build:
         description: Build the meson project
         command: |
             meson compile -v -j "%(jobs)" -C "%(builddir)"
         dependencies:
-            - meson
+            - binary(meson)
 
     - meson_install:
         description: Install results of the build to the destination directory
         command: |
             DESTDIR="%(installroot)" meson install --no-rebuild -C "%(builddir)"
         dependencies:
-            - meson
+            - binary(meson)
 
     - meson_test:
         description: Run meson test
         command: |
             meson test --no-rebuild --print-errorlogs -j "%(jobs)" -C "%(builddir)"
         dependencies:
-            - meson
+            - binary(meson)
 
 definitions:
 

diff --git a/boulder/data/macros/actions/misc.yaml b/boulder/data/macros/actions/misc.yaml
@@ -47,7 +47,7 @@ actions:
         command: |
             patch -f -p1 -i
         dependencies:
-            - patch
+            - binary(patch)
 
     - tmpfiles:
         description: Create a tmpfiles.d file for the package with given content

diff --git a/boulder/data/macros/actions/perl.yaml b/boulder/data/macros/actions/perl.yaml
@@ -8,5 +8,5 @@ actions:
         command: |
             perl Makefile.PL PREFIX="%(prefix)" NO_PACKLIST=1 NO_PERLLOCAL=1 INSTALLDIRS=vendor DESTDIR="%(installroot)"
         dependencies:
-            - perl
+            - binary(perl)
 
diff --git a/boulder/data/macros/actions/pgo.yaml b/boulder/data/macros/actions/pgo.yaml
@@ -42,7 +42,7 @@ actions:
             }
             boptim
         dependencies:
-            - llvm-bolt
+            - binary(llvm-bolt)
 
     - bolt_perf:
         description: Collect perf data suitable for the bolt macros
@@ -53,7 +53,7 @@ actions:
             }
             bperf
         dependencies:
-            - perf
+            - binary(perf)
 
     - bolt_perf2bolt:
         description: Convert perf data into bolt equivalent

diff --git a/boulder/data/macros/actions/python.yaml b/boulder/data/macros/actions/python.yaml
@@ -6,22 +6,22 @@ actions:
             test -e ./setup.py || ( echo "%%python: The ./setup.py script could not be found" ; exit 1 )
             python3 setup.py build
         dependencies:
-            - python
+            - binary(python3)
 
     - python_install:
         description: Install python package to the destination directory
         command: |
             python3 setup.py install --root="%(installroot)"
         dependencies:
-            - python
+            - binary(python3)
             - python-packaging # auto deps handler
 
     - pyproject_build:
         description: Build a wheel for python PEP517 projects
         command: |
             python3 -m build --wheel --no-isolation
         dependencies:
-            - python
+            - binary(python3)
             - python-build
             - python-wheel
 
@@ -30,7 +30,7 @@ actions:
         command: |
             python3 -m installer --destdir="%(installroot)" dist/*.whl
         dependencies:
-            - python
+            - binary(python3)
             - python-installer
 
     # TODO: Investigate whether providing additional -opt1.pyc and -opt2.pyc from increasing
@@ -41,11 +41,11 @@ actions:
         command: |
             function python_compile() {
                 if [ -z "$1" ]; then
-                    python -m compileall -q %(installroot) || exit 1
+                    python3 -m compileall -q %(installroot) || exit 1
                 else
-                    python -m compileall -q $* || exit 1
+                    python3 -m compileall -q $* || exit 1
                 fi
             }
             python_compile
         dependencies:
-            - python
+            - binary(python3)