Skip to content

Commit 69ae3d5

Browse files
committed
fix: report errors if yay is needed but it is not installed
1 parent 623beb0 commit 69ae3d5

16 files changed

+15
-59
lines changed

dev/docker/__tests__/arch-mingw.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ RUN pacman -Syuu --noconfirm && \
2020
--cppcheck true \
2121
--gcovr true \
2222
--doxygen true \
23-
--ccache true \
24-
--powershell true && \
23+
--ccache true && \
2524
# arch cleanup
2625
pacman -Scc --noconfirm && \
2726
rm -rf /var/cache/pacman/pkg/* && \

dev/docker/__tests__/arch.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,3 @@ FROM archlinux:base as runner
4444
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
4545
WORKDIR /home/app/
4646
ENTRYPOINT ["./my_exe"]
47-
48-
#### Cross Building (example)
49-
FROM setup-cpp-arch-mingw AS builder-mingw
50-
51-
COPY ./dev/cpp_vcpkg_project /home/app
52-
WORKDIR /home/app
53-
RUN bash -c 'source ~/.cpprc \
54-
&& task build_cross_mingw'

dev/docker/__tests__/fedora.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,3 @@ FROM fedora:38 as runner
4141
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
4242
WORKDIR /home/app/
4343
ENTRYPOINT ["./my_exe"]
44-
45-
#### Cross Building (example)
46-
FROM setup-cpp-fedora-mingw AS builder-mingw
47-
48-
COPY ./dev/cpp_vcpkg_project /home/app
49-
WORKDIR /home/app
50-
RUN bash -c 'source ~/.cpprc \
51-
&& task build_cross_mingw'

dev/docker/__tests__/ubuntu.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,3 @@ FROM ubuntu:22.04 as runner
4747
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
4848
WORKDIR /home/app/
4949
ENTRYPOINT ["./my_exe"]
50-
51-
#### Cross Building (example)
52-
FROM setup-cpp-ubuntu-mingw AS builder-mingw
53-
54-
COPY ./dev/cpp_vcpkg_project /home/app
55-
WORKDIR /home/app
56-
RUN bash -c 'source ~/.cpprc \
57-
&& task build_cross_mingw'

dev/docker/arch.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,3 @@ FROM archlinux:base as runner
1414
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
1515
WORKDIR /home/app/
1616
ENTRYPOINT ["./my_exe"]
17-
18-
#### Cross Building (example)
19-
FROM setup-cpp-arch-mingw AS builder-mingw
20-
21-
COPY ./dev/cpp_vcpkg_project /home/app
22-
WORKDIR /home/app
23-
RUN bash -c 'source ~/.cpprc \
24-
&& task build_cross_mingw'

dev/docker/fedora.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,3 @@ FROM fedora:38 as runner
1414
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
1515
WORKDIR /home/app/
1616
ENTRYPOINT ["./my_exe"]
17-
18-
#### Cross Building (example)
19-
FROM setup-cpp-fedora-mingw AS builder-mingw
20-
21-
COPY ./dev/cpp_vcpkg_project /home/app
22-
WORKDIR /home/app
23-
RUN bash -c 'source ~/.cpprc \
24-
&& task build_cross_mingw'

dev/docker/setup-cpp-arch-mingw.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ RUN pacman -Syuu --noconfirm && \
1919
--cppcheck true \
2020
--gcovr true \
2121
--doxygen true \
22-
--ccache true \
23-
--powershell true && \
22+
--ccache true && \
2423
# arch cleanup
2524
pacman -Scc --noconfirm && \
2625
rm -rf /var/cache/pacman/pkg/* && \

dev/docker/ubuntu.dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,3 @@ FROM ubuntu:22.04 as runner
1414
COPY --from=builder /home/app/build/my_exe/Release/ /home/app/
1515
WORKDIR /home/app/
1616
ENTRYPOINT ["./my_exe"]
17-
18-
#### Cross Building (example)
19-
FROM setup-cpp-ubuntu-mingw AS builder-mingw
20-
21-
COPY ./dev/cpp_vcpkg_project /home/app
22-
WORKDIR /home/app
23-
RUN bash -c 'source ~/.cpprc \
24-
&& task build_cross_mingw'

dist/actions/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)