Author:
Hash:
Timestamp:
+17 -15 +/-1 browse
Kevin Schoon [me@kevinschoon.com]
1dd459e5bd47ef48fbc30ba69e83cd940965e4da
Fri, 15 May 2026 09:29:02 +0000 (2 days ago)
| 1 | diff --git a/.ayllu-build.jsonnet b/.ayllu-build.jsonnet |
| 2 | index 0936b47..b89e28a 100644 |
| 3 | --- a/.ayllu-build.jsonnet |
| 4 | +++ b/.ayllu-build.jsonnet |
| 5 | @@ -1,4 +1,4 @@ |
| 6 | - local target = 'x86_64-unknown-linux-musl'; |
| 7 | + local target = 'x86_64-alpine-linux-musl'; |
| 8 | local build_image = 'localhost/ayllu-build:latest'; |
| 9 | |
| 10 | local binaries = [ |
| 11 | @@ -18,10 +18,10 @@ local subcommands = [ |
| 12 | |
| 13 | local compile_binary(name) = { |
| 14 | name: 'Cargo Build ' + name, |
| 15 | - input: 'cargo build --release --target=' + target + ' --bin=' + name, |
| 16 | + input: 'cargo build --release --bin=' + name, |
| 17 | outputs: [ |
| 18 | { |
| 19 | - path: 'target/x86_64-unknown-linux-musl/release/' + name, |
| 20 | + path: 'target/release/' + name, |
| 21 | sha256sum: null, |
| 22 | }, |
| 23 | ], |
| 24 | @@ -38,8 +38,8 @@ local bash_complete(name) = { |
| 25 | }; |
| 26 | |
| 27 | local man_page(name, section) = { |
| 28 | - path: "target/dist/man/" + name + "." + section, |
| 29 | - sha256sum: null |
| 30 | + path: 'target/dist/man/' + name + '.' + section, |
| 31 | + sha256sum: null, |
| 32 | }; |
| 33 | |
| 34 | local short_step(name, input) = { |
| 35 | @@ -59,27 +59,21 @@ local short_step(name, input) = { |
| 36 | image: build_image, |
| 37 | depends_on: ['Lint'], |
| 38 | steps: [ |
| 39 | - short_step('Cargo Test', 'cargo test --target=%{}'), |
| 40 | + short_step('Cargo Test', 'cargo test'), |
| 41 | short_step('Cargo Clippy', 'cargo clippy'), |
| 42 | ], |
| 43 | }, |
| 44 | { |
| 45 | - name: 'Compile Binaries', |
| 46 | - depends_on: ['Test'], |
| 47 | - image: build_image, |
| 48 | - steps: [compile_binary(binary) for binary in binaries], |
| 49 | - }, |
| 50 | - { |
| 51 | name: 'Distribution', |
| 52 | - depends_on: ['Compile Binaries'], |
| 53 | + depends_on: ['Lint'], |
| 54 | image: build_image, |
| 55 | steps: [ |
| 56 | { |
| 57 | name: 'Man', |
| 58 | input: 'cargo run --package xtask -- gen_man', |
| 59 | outputs: std.flattenArrays([ |
| 60 | - [man_page(name, "1") for name in binaries], |
| 61 | - [man_page("ayllu", "7")] // Misc ayllu documentation |
| 62 | + [man_page(name, '1') for name in binaries], |
| 63 | + [man_page('ayllu', '7')], // Misc ayllu documentation |
| 64 | ]), |
| 65 | }, |
| 66 | { |
| 67 | @@ -92,5 +86,13 @@ local short_step(name, input) = { |
| 68 | }, |
| 69 | ], |
| 70 | }, |
| 71 | + { |
| 72 | + name: 'Compile Binaries', |
| 73 | + depends_on: ['Test', 'Distribution'], |
| 74 | + image: build_image, |
| 75 | + steps: [ |
| 76 | + compile_binary(binary) for binary in binaries |
| 77 | + ], |
| 78 | + } |
| 79 | ], |
| 80 | } |