3

Signed-off-by: bakhtin <[email protected]>

Author: bakhtin

.github/workflows/reprotest.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Calculate SHA256
         id: sha256
         run: |
-          sha256sum target/x86_64-unknown-linux-gnu/reproducible/rbuilder-operator > rbuilder-operator.sha256
+          sha256sum target/rbuilder-operator > rbuilder-operator.sha256
           echo "hash=$(cat rbuilder-operator.sha256 | cut -d' ' -f1)" >> $GITHUB_OUTPUT
           echo "Binary SHA256 on ${{ matrix.machine }}: $(cat rbuilder-operator.sha256)"
       - name: Upload the hash

Makefile

@@ -106,26 +106,41 @@ docker-image-test-relay: ## Build a test relay Docker image
 
 ##@ Debian Packages
 
+# Define binary paths for smart dependencies
+BID_SCRAPER_BIN := target/$(if $(BUILD_TARGET),$(BUILD_TARGET)/)$(BUILD_PROFILE)/bid-scraper
+RBUILDER_OPERATOR_BIN := target/$(if $(BUILD_TARGET),$(BUILD_TARGET)/)$(BUILD_PROFILE)/rbuilder-operator
+RBUILDER_REBALANCER_BIN := target/$(if $(BUILD_TARGET),$(BUILD_TARGET)/)$(BUILD_PROFILE)/rbuilder-rebalancer
+
 .PHONY: install-cargo-deb
 install-cargo-deb:
 	@command -v cargo-deb >/dev/null 2>&1 || cargo install [email protected] --locked
 
+# Build individual binaries only if they don't exist - delegate to existing build targets
+$(BID_SCRAPER_BIN): build-bid-scraper
+	@# Binary built by build-bid-scraper target
+
+$(RBUILDER_OPERATOR_BIN): build-rbuilder-operator
+	@# Binary built by build-rbuilder-operator target
+
+$(RBUILDER_REBALANCER_BIN): build-rbuilder-rebalancer
+	@# Binary built by build-rbuilder-rebalancer target
+
 .PHONY: build-deb-bid-scraper
-build-deb-bid-scraper: install-cargo-deb build-bid-scraper ## Build bid-scraper Debian package
+build-deb-bid-scraper: install-cargo-deb $(BID_SCRAPER_BIN) ## Build bid-scraper Debian package
 	cargo deb --profile $(BUILD_PROFILE) --no-build --no-dbgsym --no-strip \
 		-p bid-scraper \
 		$(if $(BUILD_TARGET),--target $(BUILD_TARGET)) \
 		$(if $(VERSION),--deb-version "1~$(VERSION)")
 
 .PHONY: build-deb-rbuilder-operator
-build-deb-rbuilder-operator: install-cargo-deb build-rbuilder-operator ## Build rbuilder-operator Debian package
+build-deb-rbuilder-operator: install-cargo-deb $(RBUILDER_OPERATOR_BIN) ## Build rbuilder-operator Debian package
 	cargo deb --profile $(BUILD_PROFILE) --no-build --no-dbgsym --no-strip \
 		-p rbuilder-operator \
 		$(if $(BUILD_TARGET),--target $(BUILD_TARGET)) \
 		$(if $(VERSION),--deb-version "1~$(VERSION)")
 
 .PHONY: build-deb-rbuilder-rebalancer
-build-deb-rbuilder-rebalancer: install-cargo-deb build-rbuilder-rebalancer ## Build rbuilder-rebalancer Debian package
+build-deb-rbuilder-rebalancer: install-cargo-deb $(RBUILDER_REBALANCER_BIN) ## Build rbuilder-rebalancer Debian package
 	cargo deb --profile $(BUILD_PROFILE) --no-build --no-dbgsym --no-strip \
 		-p rbuilder-rebalancer \
 		$(if $(BUILD_TARGET),--target $(BUILD_TARGET)) \

docker/Dockerfile.reproducible

@@ -14,4 +14,4 @@ COPY . .
 RUN SOURCE_DATE=1730000000 make build && make build-deb
 
 FROM scratch AS artifacts
-COPY --from=builder /build/target/x86_64-unknown-linux-gnu/reproducible/* /
+COPY --from=builder /build/target/x86_64-unknown-linux-gnu/reproducible/ /