mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #105433 - ComputerDruid:docker_continuation_fix, r=jyn514

Browse Source 
CI: add missing line continuation marker

Resolves this docker warning:

```
[WARNING]: Empty continuation line found in:
    RUN apt-get update && apt-get install -y --no-install-recommends   g++   gcc-multilib   make   ninja-build   file   curl   ca-certificates   python2.7   python3.9   git   cmake   sudo   gdb   llvm-13-tools   llvm-13-dev   libedit-dev   libssl-dev   pkg-config   zlib1g-dev   xz-utils   nodejs     apt-transport-https software-properties-common &&     curl -s "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" > packages-microsoft-prod.deb &&     dpkg -i packages-microsoft-prod.deb &&     apt-get update &&     apt-get install -y powershell     && rm -rf /var/lib/apt/lists/*
Warning: : Empty continuation lines will become errors in a future release.
```
This commit is contained in:
Matthias Krüger 2022-12-08 12:57:32 +01:00 committed by GitHub
commit d429e463c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/docker/host-x86_64/x86_64-gnu-llvm-13/Dockerfile
View File

@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
zlib1g-dev \ zlib1g-dev \
xz-utils \ xz-utils \
nodejs \ nodejs \
\
# Install powershell so we can test x.ps1 on Linux # Install powershell so we can test x.ps1 on Linux
apt-transport-https software-properties-common && \ apt-transport-https software-properties-common && \
curl -s "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" > packages-microsoft-prod.deb && \ curl -s "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" > packages-microsoft-prod.deb && \

2
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
View File

@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
sudo \ sudo \
xz-utils \ xz-utils \
tidy \ tidy \
\
# Install dependencies for chromium browser # Install dependencies for chromium browser
gconf-service \ gconf-service \
libasound2 \ libasound2 \