Skip to content

Commit 652771d

Browse files
authored
Merge pull request #68 from cgwalters/ci-install-all
ci: Switch to `make test-bin-archive`
2 parents 498fd84 + 1c567ea commit 652771d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ jobs:
5252
with:
5353
key: "build"
5454
- name: Build
55-
run: cargo build --release --features internal-testing-api
55+
run: make test-bin-archive
5656
- name: Upload binary
5757
uses: actions/upload-artifact@v2
5858
with:
59-
name: bootc
60-
path: target/release/bootc
59+
name: bootc.tar.zst
60+
path: target/bootc.tar.zst
6161
build-minimum-toolchain:
6262
name: "Build using MSRV"
6363
runs-on: ubuntu-latest
@@ -122,9 +122,9 @@ jobs:
122122
- name: Download
123123
uses: actions/download-artifact@v2
124124
with:
125-
name: bootc
125+
name: bootc.tar.zst
126126
- name: Install
127-
run: sudo install bootc /usr/bin && rm -v bootc
127+
run: sudo tar -C / -xvf bootc.tar.zst
128128
- name: Integration tests
129129
run: sudo podman run --rm -ti --privileged -v /run/systemd:/run/systemd -v /:/run/host -v /usr/bin/bootc:/usr/bin/bootc --pid=host quay.io/fedora/fedora-coreos:testing-devel bootc internal-tests run-privileged-integration
130130
container-tests:
@@ -136,8 +136,8 @@ jobs:
136136
- name: Download
137137
uses: actions/download-artifact@v2
138138
with:
139-
name: bootc
139+
name: bootc.tar.zst
140140
- name: Install
141-
run: install bootc /usr/bin && rm -v bootc
141+
run: sudo tar -C / -xvf bootc.tar.zst
142142
- name: Integration tests
143143
run: bootc internal-tests run-container-integration

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ install:
1111
install -D -t $(DESTDIR)$(prefix)/lib/bootc/install lib/src/install/*.toml
1212

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

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

1919
install-kola-tests:
2020
install -D -t $(DESTDIR)$(prefix)/lib/coreos-assembler/tests/kola/bootc tests/kolainst/*

ci/Dockerfile.fcos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ COPY . .
66
RUN make test-bin-archive
77

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

0 commit comments

Comments
 (0)