Skip to content

Commit d136ad1

Browse files
committed
Remove redundant libcurl4-openssl-dev installation commands
1 parent 849c8d7 commit d136ad1

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ jobs:
3636
uses: github/codeql-action/init@v3
3737
with:
3838
languages: javascript-typescript, c-cpp
39-
- name: Install system libcurl
40-
if: matrix.preset == 'linux-arm64-ci' || matrix.preset == 'linux-ci'
41-
run: |
42-
sudo apt update
43-
sudo apt install -y libcurl4-openssl-dev
4439
- name: Configure and Build
4540
if: matrix.preset != 'windows-ci'
4641
run: |

azure-pipelines/vcpkg-arm64/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ RUN chroot /crossrootfs/arm64 apt-get clean && \
5151

5252
# Repeated runs of apt-get install workaround 'hash sum mismatch' errors
5353
# (This is also why these are a separate cache layer)
54-
RUN chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
55-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
56-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
57-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
58-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
59-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
60-
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev && \
54+
RUN chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
55+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
56+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
57+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
58+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
59+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" || \
60+
chroot /crossrootfs/arm64 apt-get install -y build-essential symlinks "g++-9" && \
6161
chroot /crossrootfs/arm64 symlinks -cr /usr && \
6262
chroot /crossrootfs/arm64 apt-get clean
6363

azure-pipelines/vcpkg-linux/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ RUN chroot /crossrootfs/x64 apt-get clean && \
5050

5151
# Repeated runs of apt-get install workaround 'hash sum mismatch' errors
5252
# (This is also why these are a separate cache layer)
53-
RUN chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
54-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
55-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
56-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
57-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
58-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev || \
59-
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" libcurl4-openssl-dev && \
53+
RUN chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
54+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
55+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
56+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
57+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
58+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" || \
59+
chroot /crossrootfs/x64 apt-get install -y build-essential symlinks "g++-9" && \
6060
chroot /crossrootfs/x64 symlinks -cr /usr && \
6161
chroot /crossrootfs/x64 apt-get clean
6262

0 commit comments

Comments
 (0)