Skip to content

Commit

Permalink
build: Install bin-archive in target/
Browse files Browse the repository at this point in the history
To avoid polluting the toplevel.

Signed-off-by: Colin Walters <[email protected]>
  • Loading branch information
cgwalters committed Feb 25, 2023
1 parent da3a533 commit 90cf87d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ install:
install -D -t $(DESTDIR)$(prefix)/bin target/release/bootc

bin-archive: all
$(MAKE) install DESTDIR=tmp-install && tar --zstd -C tmp-install -cf bootc.tar.zst . && rm tmp-install -rf
$(MAKE) install DESTDIR=tmp-install && tar --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf

test-bin-archive: all-test
$(MAKE) install DESTDIR=tmp-install && tar --zstd -C tmp-install -cf bootc.tar.zst . && rm tmp-install -rf
$(MAKE) install DESTDIR=tmp-install && tar --zstd -C tmp-install -cf target/bootc.tar.zst . && rm tmp-install -rf

install-kola-tests:
install -D -t $(DESTDIR)$(prefix)/lib/coreos-assembler/tests/kola/bootc tests/kolainst/*
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.fcos
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ COPY . .
RUN make test-bin-archive

FROM quay.io/fedora/fedora-coreos:testing-devel
COPY --from=builder /src/bootc.tar.zst /tmp
COPY --from=builder /src/target/bootc.tar.zst /tmp
RUN tar -xvf /tmp/bootc.tar.zst && ostree container commit

0 comments on commit 90cf87d

Please sign in to comment.