Skip to content

Commit b399230

Browse files
committed
ci: Merge from no docker
1 parent 2a84e45 commit b399230

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/docker/Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@ ARG BASE_IMAGE
66

77
FROM $BASE_IMAGE
88

9-
# Set DEBIAN_FRONTEND to noninteractive
10-
ENV DEBIAN_FRONTEND=noninteractive
11-
129
#Install base dependencys
1310
RUN apt-get update
14-
RUN apt-get install -y --no-install-recommends \
11+
RUN apt-get install --yes --no-install-recommends \
1512
devscripts equivs build-essential lintian clang git lsb-release \
1613
python3 gpg dirmngr sudo xauth curl kmod \
1714
cppcheck shellcheck && \
@@ -21,7 +18,7 @@ RUN apt-get install -y --no-install-recommends \
2118
RUN --mount=type=bind,source=.,target=/linuxcnc-src,rw \
2219
cd linuxcnc-src && \
2320
debian/configure && \
24-
apt-get -y build-dep . && \
21+
apt-get --yes build-dep . && \
2522
apt-get clean
2623

2724
#Install linuxcnc install dependencys
@@ -35,11 +32,11 @@ RUN --mount=type=bind,source=.,target=/linuxcnc-src,rw \
3532
cd linuxcnc-src && \
3633
debian/configure && \
3734
debuild -us -uc --build=any && \
38-
apt-get install -y --no-install-recommends \
35+
apt-get install --yes --no-install-recommends \
3936
../linuxcnc-uspace_*.deb \
4037
../linuxcnc-uspace-dev_*.deb \
4138
../linuxcnc-uspace-dbgsym_*.deb && \
42-
apt-get purge -y linuxcnc-uspace linuxcnc-uspace-dev linuxcnc-uspace-dbgsym && \
39+
apt-get purge --yes linuxcnc-uspace linuxcnc-uspace-dev linuxcnc-uspace-dbgsym && \
4340
apt-mark manual $(apt-get --dry-run autoremove | grep -Po '^Remv \K[^ ]+') && \
4441
rm -f ../linuxcnc*.* && \
4542
apt-get clean

.github/workflows/ci-docker.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
permissions:
1414
contents: read # to fetch code (actions/checkout)
1515

16+
env:
17+
DEBIAN_FRONTEND: noninteractive
18+
1619
jobs:
1720

1821
rip-and-test:
@@ -241,7 +244,7 @@ jobs:
241244
- name: Install debian packages
242245
run: |
243246
set -x
244-
apt-get -y install ../*.deb --no-install-recommends
247+
apt-get --yes --no-install-recommends install ../*.deb
245248
- name: Test debian packages
246249
run: |
247250
set -x
@@ -320,7 +323,7 @@ jobs:
320323
- name: Install debian packages
321324
run: |
322325
set -x
323-
apt-get -y install ../*.deb --no-install-recommends
326+
apt-get --yes --no-install-recommends install ../*.deb
324327
- name: Gather build artifacts
325328
run: |
326329
set -x

0 commit comments

Comments
 (0)