Skip to content

Commit cdb223c

Browse files
committed
fix(ci): scope binary builds to cargo packages
Signed-off-by: Simon Scatton <[email protected]>
1 parent 312c797 commit cdb223c

7 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎.github/actions/build-rust-binary/action.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ name: Build Rust Binary
55
description: Build, verify, package, and upload an auditable Rust binary
66

77
inputs:
8+
package:
9+
description: Cargo package that owns the binary
10+
required: true
811
binary:
912
description: Cargo binary name
1013
required: true
@@ -61,7 +64,7 @@ runs:
6164
shell: nix develop ${{ inputs.dev-shell }} -c bash -euo pipefail {0}
6265
env:
6366
OPENSHELL_IMAGE_TAG: ${{ inputs.image-tag }}
64-
run: GIT_DIR=/nonexistent cargo auditable build --release --bin "${{ inputs.binary }}" ${{ inputs.extra-cargo-flags }}
67+
run: GIT_DIR=/nonexistent cargo auditable build --release --package "${{ inputs.package }}" --bin "${{ inputs.binary }}" ${{ inputs.extra-cargo-flags }}
6568

6669
- name: Verify ${{ inputs.binary }}
6770
shell: nix develop ${{ inputs.dev-shell }} -c bash -euo pipefail {0}

‎.github/workflows/branch-e2e.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ jobs:
141141
interpreter: /lib/ld-linux-aarch64.so.1
142142
uses: ./.github/workflows/build-binaries.yml
143143
with:
144+
package: openshell-server
144145
binary: openshell-gateway
145146
artifact-name: openshell-gateway-plain-${{ matrix.triple }}
146147
triple: ${{ matrix.triple }}
@@ -158,6 +159,7 @@ jobs:
158159
contents: read
159160
uses: ./.github/workflows/build-binaries.yml
160161
with:
162+
package: openshell-driver-docker
161163
binary: openshell-driver-docker
162164
triple: aarch64-unknown-linux-gnu
163165
runner: linux-arm64-cpu8
@@ -173,6 +175,7 @@ jobs:
173175
contents: read
174176
uses: ./.github/workflows/build-binaries.yml
175177
with:
178+
package: openshell-driver-podman
176179
binary: openshell-driver-podman
177180
triple: x86_64-unknown-linux-gnu
178181
runner: linux-amd64-cpu8
@@ -188,6 +191,7 @@ jobs:
188191
contents: read
189192
uses: ./.github/workflows/build-binaries.yml
190193
with:
194+
package: openshell-driver-kubernetes
191195
binary: openshell-driver-kubernetes
192196
triple: x86_64-unknown-linux-gnu
193197
runner: linux-amd64-cpu8

‎.github/workflows/build-binaries.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ name: Build Binary
66
on:
77
workflow_call:
88
inputs:
9+
package:
10+
required: true
11+
type: string
912
binary:
1013
required: true
1114
type: string
@@ -64,6 +67,7 @@ jobs:
6467

6568
- uses: ./.github/actions/build-rust-binary
6669
with:
70+
package: ${{ inputs.package }}
6771
binary: ${{ inputs.binary }}
6872
triple: ${{ inputs.triple }}
6973
dev-shell: ${{ inputs['dev-shell'] }}

‎.github/workflows/build-cli-binaries.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
dev_shell: .#devShells.aarch64-darwin.default
4141
uses: ./.github/workflows/build-binaries.yml
4242
with:
43+
package: openshell-cli
4344
binary: openshell
4445
triple: ${{ matrix.triple }}
4546
runner: ${{ matrix.runner }}

‎.github/workflows/build-gateway-binaries.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ jobs:
4343
interpreter: ""
4444
uses: ./.github/workflows/build-binaries.yml
4545
with:
46+
package: openshell-server
4647
binary: openshell-gateway
4748
triple: ${{ matrix.triple }}
4849
runner: ${{ matrix.runner }}

‎.github/workflows/build-sandbox-binaries.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
dev_shell: .#devShells.aarch64-linux.musl
3838
uses: ./.github/workflows/build-binaries.yml
3939
with:
40+
package: openshell-sandbox
4041
binary: openshell-sandbox
4142
triple: ${{ matrix.triple }}
4243
runner: ${{ matrix.runner }}

‎.github/workflows/build-vm-driver.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
env:
9494
OPENSHELL_VM_RUNTIME_COMPRESSED_DIR: ${{ github.workspace }}/target/vm-runtime-compressed
9595
with:
96+
package: openshell-driver-vm
9697
binary: openshell-driver-vm
9798
triple: ${{ matrix.triple }}
9899
dev-shell: ${{ matrix.dev_shell }}

0 commit comments

Comments
 (0)