Skip to content

Commit f71f6d2

Browse files
committed
feat(debian): test works with select packages
1 parent 0b07698 commit f71f6d2

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

debian/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ exec: ## Execute a COMMAND inside an image for given TARGET_ARCH
9494
$(DOCKER_FLAGS) --rm $(IMAGE) \
9595
bash -c "\
9696
([ -f /apt/$(REPO_NAME)/Packages ] && \
97-
echo 'deb [trusted=yes] file:///apt stable/' > /etc/apt/sources.list.d/cartesi-deb-apt.list && \
97+
echo 'deb [trusted=yes arch=$(TARGET_ARCH)] file:///apt stable/' > /etc/apt/sources.list.d/cartesi-deb-apt.list && \
9898
([ -f /apt/keys/$(KEY_NAME).gpg ] && gpg --dearmor -o /etc/apt/trusted.gpg.d/$(KEY_NAME).gpg < /apt/keys/$(KEY_NAME).gpg || true) && \
9999
apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/cartesi-deb-apt.list -o Dir::Etc::sourceparts=- -o APT::Get::List-Cleanup=0 || true) && \
100100
$(COMMAND)"
@@ -118,14 +118,14 @@ test: ## Test built packages for all architectures (amd64/arm64/riscv64)
118118
ifeq ($(TARGET_ARCH),riscv64)
119119
test-packages:
120120
@$(MAKE) --no-print-directory exec COMMAND="\
121-
apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) $(PACKAGES_RISCV64) && \
122-
rollup --help && \
123-
cartesi-machine --final-hash"
121+
apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) $(PACKAGES_RISCV64) \
122+
$(if $(filter cartesi-machine-guest-tools,$(PACKAGES_RISCV64)),&& rollup --help) \
123+
$(if $(filter cartesi-machine-emulator,$(PACKAGES_ANYARCH)),&& cartesi-machine --final-hash)"
124124
else
125125
test-packages: ## Test built packages for given TARGET_ARCH
126126
@$(MAKE) --no-print-directory exec COMMAND="\
127-
apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) && \
128-
cartesi-machine --final-hash"
127+
apt-get install --no-install-recommends -y $(PACKAGES_ANYARCH) $(PACKAGES_ALLARCH) \
128+
$(if $(filter cartesi-machine-emulator,$(PACKAGES_ANYARCH)),&& cartesi-machine --final-hash)"
129129
endif
130130

131131
distclean: ## Remove everything from APT repository directory

0 commit comments

Comments
 (0)