Skip to content

Commit 712a912

Browse files
authored
all: use apt over apt-get for common APT subcommands (#21359)
1 parent f995205 commit 712a912

File tree

18 files changed

+64
-64
lines changed

18 files changed

+64
-64
lines changed

.github/workflows/cross_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ jobs:
6161
run: |
6262
## sudo dpkg --add-architecture i386
6363
.github/workflows/retry.sh sudo apt update
64-
.github/workflows/retry.sh sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev
65-
.github/workflows/retry.sh sudo apt-get install --quiet -y mingw-w64 wine-stable winetricks
66-
## .github/workflows/retry.sh sudo apt-get install --quiet -y wine32
64+
.github/workflows/retry.sh sudo apt install --quiet -y libssl-dev sqlite3 libsqlite3-dev
65+
.github/workflows/retry.sh sudo apt install --quiet -y mingw-w64 wine-stable winetricks
66+
## .github/workflows/retry.sh sudo apt install --quiet -y wine32
6767
6868
- name: Turn off the wine crash dialog
6969
run: winetricks nocrashdialog

.github/workflows/gg_regressions_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
# libxcursor-dev libxi-dev : V gfx deps
4141
# libgl1-mesa-dri : For headless rendering / software DRI driver (LIBGL_ALWAYS_SOFTWARE=true)
4242
# freeglut3-dev : Fixes graphic apps compilation with tcc
43-
.github/workflows/retry.sh sudo apt-get update
44-
.github/workflows/retry.sh sudo apt-get install imagemagick openimageio-tools libgl1-mesa-dri xvfb libxcursor-dev libxi-dev freeglut3-dev xsel xclip
43+
.github/workflows/retry.sh sudo apt update
44+
.github/workflows/retry.sh sudo apt install imagemagick openimageio-tools libgl1-mesa-dri xvfb libxcursor-dev libxi-dev freeglut3-dev xsel xclip
4545
.github/workflows/retry.sh wget https://raw.githubusercontent.com/tremby/imgur.sh/c98345d/imgur.sh
4646
.github/workflows/retry.sh git clone https://github.com/Larpon/gg-regression-images gg-regression-images
4747
chmod +x ./imgur.sh

.github/workflows/linux_ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
- uses: actions/checkout@v4
3232
- name: Install dependencies
3333
run: |
34-
.github/workflows/retry.sh sudo apt-get update
35-
.github/workflows/retry.sh sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
36-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
34+
.github/workflows/retry.sh sudo apt update
35+
.github/workflows/retry.sh sudo apt install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind
36+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
3737
# The following is needed for examples/wkhtmltopdf.v
3838
.github/workflows/retry.sh wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb
39-
.github/workflows/retry.sh sudo apt-get install --quiet -y xfonts-75dpi xfonts-base
40-
.github/workflows/retry.sh sudo apt-get install --quiet -y expect
39+
.github/workflows/retry.sh sudo apt install --quiet -y xfonts-75dpi xfonts-base
40+
.github/workflows/retry.sh sudo apt install --quiet -y expect
4141
.github/workflows/retry.sh sudo dpkg -i wkhtmltox_0.12.6-1.focal_amd64.deb
4242
- name: Build v
4343
run: |
@@ -118,9 +118,9 @@ jobs:
118118
- uses: actions/checkout@v4
119119
- name: Install dependencies
120120
run: |
121-
.github/workflows/retry.sh sudo apt-get update
122-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
123-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
121+
.github/workflows/retry.sh sudo apt update
122+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
123+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
124124
- name: Build V
125125
run: make -j4 && ./v -cc gcc -cg -cstrict -o v cmd/v
126126
- name: Valgrind v.c
@@ -225,10 +225,10 @@ jobs:
225225
- uses: actions/checkout@v4
226226
- name: Install dependencies
227227
run: |
228-
.github/workflows/retry.sh sudo apt-get update
229-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
230-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
231-
.github/workflows/retry.sh sudo apt-get install --quiet -y clang
228+
.github/workflows/retry.sh sudo apt update
229+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
230+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
231+
.github/workflows/retry.sh sudo apt install --quiet -y clang
232232
- name: Build V
233233
run: make -j4 && ./v -cc clang -cg -cstrict -o v cmd/v
234234
- name: Valgrind
@@ -327,7 +327,7 @@ jobs:
327327
# - uses: actions/checkout@v4
328328
# - name: Install dependencies
329329
# run: |
330-
# .github/workflows/retry.sh sudo apt-get install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind
330+
# .github/workflows/retry.sh sudo apt install --quiet -y musl musl-tools libssl-dev sqlite3 libsqlite3-dev valgrind
331331
# - name: Build v
332332
# run: echo $VFLAGS && make -j4 && ./v -cg -o v cmd/v
333333
# # - name: Test v binaries

.github/workflows/native_backend_tests_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Install linker
6363
if: ${{ startsWith(matrix.os, 'ubuntu')}}
6464
run: |
65-
.github/workflows/retry.sh sudo apt-get install --quiet -y binutils
65+
.github/workflows/retry.sh sudo apt install --quiet -y binutils
6666
6767
- name: Build V with make.bat
6868
if: ${{ startsWith(matrix.os, 'windows') }}

.github/workflows/other_ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ jobs:
7878

7979
- name: Install dependencies
8080
run: |
81-
.github/workflows/retry.sh sudo apt-get update
82-
.github/workflows/retry.sh sudo apt-get install --quiet -y libsodium-dev libssl-dev sqlite3 libsqlite3-dev postgresql libpq-dev valgrind
83-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
84-
.github/workflows/retry.sh sudo apt-get install --quiet -y g++-9 g++-11
81+
.github/workflows/retry.sh sudo apt update
82+
.github/workflows/retry.sh sudo apt install --quiet -y libsodium-dev libssl-dev sqlite3 libsqlite3-dev postgresql libpq-dev valgrind
83+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
84+
.github/workflows/retry.sh sudo apt install --quiet -y g++-9 g++-11
8585
8686
- name: Build v
8787
run: make

.github/workflows/sanitized_ci.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ jobs:
8181
- uses: actions/checkout@v4
8282
- name: Install dependencies
8383
run: |
84-
.github/workflows/retry.sh sudo apt-get update
85-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
86-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
87-
.github/workflows/retry.sh sudo apt-get install clang
84+
.github/workflows/retry.sh sudo apt update
85+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
86+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
87+
.github/workflows/retry.sh sudo apt install clang
8888
- name: Build V
8989
run: make && ./v -cg -cstrict -o v cmd/v
9090
- name: Ensure code is well formatted
@@ -106,8 +106,8 @@ jobs:
106106
- name: Install dependencies
107107
run: |
108108
.github/workflows/retry.sh sudo apt update
109-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
110-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
109+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
110+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
111111
- name: Build V
112112
run: make && ./v -cg -cstrict -o v cmd/v
113113
- name: Ensure code is well formatted
@@ -129,9 +129,9 @@ jobs:
129129
- name: Install dependencies
130130
run: |
131131
.github/workflows/retry.sh sudo apt update
132-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
133-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
134-
.github/workflows/retry.sh sudo apt-get install clang
132+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
133+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
134+
.github/workflows/retry.sh sudo apt install clang
135135
- name: Build V
136136
run: make && ./v -cg -cstrict -o v cmd/v
137137
- name: Ensure code is well formatted
@@ -185,9 +185,9 @@ jobs:
185185
- name: Install dependencies
186186
run: |
187187
.github/workflows/retry.sh sudo apt update
188-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
189-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
190-
.github/workflows/retry.sh sudo apt-get install clang
188+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
189+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
190+
.github/workflows/retry.sh sudo apt install clang
191191
- name: Build V
192192
run: make && ./v -cg -cstrict -o v cmd/v
193193
- name: Ensure code is well formatted
@@ -213,9 +213,9 @@ jobs:
213213
- name: Install dependencies
214214
run: |
215215
.github/workflows/retry.sh sudo apt update
216-
.github/workflows/retry.sh sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
217-
.github/workflows/retry.sh sudo apt-get install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
218-
.github/workflows/retry.sh sudo apt-get install clang
216+
.github/workflows/retry.sh sudo apt install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
217+
.github/workflows/retry.sh sudo apt install --quiet -y libfreetype6-dev libxi-dev libxcursor-dev libgl-dev
218+
.github/workflows/retry.sh sudo apt install clang
219219
- name: Build V
220220
run: make && ./v -cc clang -cg -cstrict -o v cmd/v
221221
- name: Ensure code is well formatted

.github/workflows/toml_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- uses: actions/checkout@v4
2525
- name: Install dependencies
2626
run: |
27-
.github/workflows/retry.sh sudo apt-get update
28-
.github/workflows/retry.sh sudo apt-get install --quiet -y jq libgc-dev
27+
.github/workflows/retry.sh sudo apt update
28+
.github/workflows/retry.sh sudo apt install --quiet -y jq libgc-dev
2929
- name: Build V
3030
run: make
3131

.github/workflows/v_apps_and_modules_compile_ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929

3030
- name: Install dependencies
3131
run: |
32-
v retry -- sudo apt-get update
33-
v retry -- sudo apt-get install --quiet -y libgc-dev libsodium-dev libssl-dev sqlite3 libsqlite3-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
34-
v retry -- sudo apt-get install --quiet -y --no-install-recommends sassc libgit2-dev ## needed by gitly
32+
v retry -- sudo apt update
33+
v retry -- sudo apt install --quiet -y libgc-dev libsodium-dev libssl-dev sqlite3 libsqlite3-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
34+
v retry -- sudo apt install --quiet -y --no-install-recommends sassc libgit2-dev ## needed by gitly
3535
3636
- name: Test vtcc
3737
run: .github/workflows/compile_v_with_vtcc.sh
@@ -214,16 +214,16 @@ jobs:
214214

215215
- name: Install dependencies
216216
run: |
217-
v retry -- sudo apt-get update
218-
v retry -- sudo apt-get install --quiet -y libgc-dev libsodium-dev libssl-dev sqlite3 libsqlite3-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
219-
v retry -- sudo apt-get install --quiet -y --no-install-recommends gfortran liblapacke-dev libopenblas-dev ## for vsl/vtl
220-
v retry -- sudo apt-get install --quiet -y --no-install-recommends libhdf5-cpp-103 libhdf5-dev libhdf5-mpi-dev hdf5-tools libopenmpi-dev opencl-headers liblapacke-dev libopenblas-dev ## needed by VSL
217+
v retry -- sudo apt update
218+
v retry -- sudo apt install --quiet -y libgc-dev libsodium-dev libssl-dev sqlite3 libsqlite3-dev libfreetype6-dev libxi-dev libxcursor-dev libgl-dev xfonts-75dpi xfonts-base
219+
v retry -- sudo apt install --quiet -y --no-install-recommends gfortran liblapacke-dev libopenblas-dev ## for vsl/vtl
220+
v retry -- sudo apt install --quiet -y --no-install-recommends libhdf5-cpp-103 libhdf5-dev libhdf5-mpi-dev hdf5-tools libopenmpi-dev opencl-headers liblapacke-dev libopenblas-dev ## needed by VSL
221221
222222
- name: Build vlang/vsl
223223
if: ${{ !cancelled() && steps.build.outcome == 'success' }}
224224
run: |
225225
echo "Installing dependencies"
226-
v retry -- sudo apt-get install --quiet -y --no-install-recommends \
226+
v retry -- sudo apt install --quiet -y --no-install-recommends \
227227
gfortran \
228228
libxi-dev \
229229
libxcursor-dev \

.github/workflows/vinix_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828

2929
- name: Install dependencies
3030
run: |
31-
.github/workflows/retry.sh sudo apt-get update
32-
.github/workflows/retry.sh sudo apt-get install build-essential meson -y
31+
.github/workflows/retry.sh sudo apt update
32+
.github/workflows/retry.sh sudo apt install build-essential meson -y
3333
3434
- name: Build V
3535
run: make

.github/workflows/websockets_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Install dependencies
28-
run: .github/workflows/retry.sh sudo apt-get install --quiet -y libssl-dev
28+
run: .github/workflows/retry.sh sudo apt install --quiet -y libssl-dev
2929
- name: Build v
3030
run: |
3131
echo $VFLAGS

0 commit comments

Comments
 (0)