Skip to content

Commit 3e2e530

Browse files
fix(docker): simplify artifact extraction
1 parent 313f025 commit 3e2e530

5 files changed

Lines changed: 26 additions & 12 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix:
2626
include:
2727
- name: Windows-AMD64
28-
os: windows-2019
28+
os: windows-2022
2929
arch: x86_64
3030
msystem: ucrt64
3131
toolchain: ucrt-x86_64

docker/archlinux.dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,13 @@ rm -f /build/sunshine/pkg/sunshine-debug*.pkg.tar.zst
114114
ls -a
115115
_PKGBUILD
116116

117-
FROM scratch AS artifacts
117+
FROM sunshine-base AS sunshine
118118

119119
COPY --link --from=sunshine-build /build/sunshine/pkg/sunshine*.pkg.tar.zst /sunshine.pkg.tar.zst
120-
COPY --link --from=sunshine-build /build/sunshine/sunshine.pkg.tar.gz /sunshine.pkg.tar.gz
121-
122-
FROM sunshine-base AS sunshine
123120

124-
COPY --link --from=artifacts /sunshine.pkg.tar.zst /
121+
# artifacts to be extracted in CI
122+
COPY --link --from=sunshine-build /build/sunshine/pkg/sunshine*.pkg.tar.zst /artifacts/sunshine.pkg.tar.zst
123+
COPY --link --from=sunshine-build /build/sunshine/sunshine.pkg.tar.gz /artifacts/sunshine.pkg.tar.gz
125124

126125
# install sunshine
127126
RUN <<_INSTALL_SUNSHINE

docker/debian-bookworm.dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ Xvfb ${DISPLAY} -screen 0 1024x768x24 &
5151
./test_sunshine --gtest_color=yes
5252
_TEST
5353

54-
FROM scratch AS artifacts
54+
FROM sunshine-base AS sunshine
55+
5556
ARG BASE
5657
ARG TAG
5758
ARG TARGETARCH
58-
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine-${BASE}-${TAG}-${TARGETARCH}.deb
5959

60-
FROM sunshine-base AS sunshine
60+
# artifacts to be extracted in CI
61+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /artifacts/sunshine-${BASE}-${TAG}-${TARGETARCH}.deb
6162

6263
# copy deb from builder
63-
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
64+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine.deb
6465

6566
# install sunshine
6667
RUN <<_INSTALL_SUNSHINE

docker/ubuntu-22.04.dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,15 @@ COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine
5959

6060
FROM sunshine-base AS sunshine
6161

62+
ARG BASE
63+
ARG TAG
64+
ARG TARGETARCH
65+
66+
# artifacts to be extracted in CI
67+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /artifacts/sunshine-${BASE}-${TAG}-${TARGETARCH}.deb
68+
6269
# copy deb from builder
63-
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
70+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine.deb
6471

6572
# install sunshine
6673
RUN <<_INSTALL_SUNSHINE

docker/ubuntu-24.04.dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,15 @@ COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine
5959

6060
FROM sunshine-base AS sunshine
6161

62+
ARG BASE
63+
ARG TAG
64+
ARG TARGETARCH
65+
66+
# artifacts to be extracted in CI
67+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /artifacts/sunshine-${BASE}-${TAG}-${TARGETARCH}.deb
68+
6269
# copy deb from builder
63-
COPY --link --from=artifacts /sunshine*.deb /sunshine.deb
70+
COPY --link --from=sunshine-build /build/sunshine/build/cpack_artifacts/Sunshine.deb /sunshine.deb
6471

6572
# install sunshine
6673
RUN <<_INSTALL_SUNSHINE

0 commit comments

Comments
 (0)