Skip to content

Commit 428b328

Browse files
authored
ci: avoid duplicating work by removing the remaining -skip-unused tasks, since that is the new default (#23746)
1 parent 9bed50d commit 428b328

File tree

9 files changed

+33
-95
lines changed

9 files changed

+33
-95
lines changed

.github/workflows/compile_discordv.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,5 @@ show "Checkout last known good commit"
1515
git checkout ce9ff457fce92d5bb15df2974440cd8292457ee0
1616
show "Execute Tests"
1717
v test .
18-
show "Execute Tests with -skip-unused"
19-
v -skip-unused test .
20-
2118
cd ..
2219
rm -rf discord/

.github/workflows/linux_ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ jobs:
4141
run: v run ci/linux_ci.vsh test_v_to_c_tcc
4242
- name: v self compilation
4343
run: v run ci/linux_ci.vsh v_self_compilation_tcc
44-
- name: v self compilation with -skip-unused
45-
run: v run ci/linux_ci.vsh v_self_compilation_skip_unused_tcc
46-
- name: Test vlib modules with -skip-unused
47-
run: v run ci/linux_ci.vsh test_vlib_skip_unused_tcc
4844
- name: v doctor
4945
run: v run ci/linux_ci.vsh v_doctor_tcc
5046
- name: Verify `v test` works
@@ -121,18 +117,14 @@ jobs:
121117
run: v run ci/linux_ci.vsh build_option_test_autofree_gcc
122118
- name: V self compilation with -parallel-cc
123119
run: v run ci/linux_ci.vsh v_self_compilation_parallel_cc_gcc
124-
- name: Test vlib modules with -skip-unused
125-
run: v run ci/linux_ci.vsh test_vlib_skip_unused_gcc
126120
- name: Build modules
127121
run: v run ci/linux_ci.vsh build_modules_gcc
128122
- name: native machine code generation
129123
run: v run ci/linux_ci.vsh native_machine_code_generation_gcc
130-
- name: compile vdoctor.v with -skip-unused and -prod
131-
run: v run ci/linux_ci.vsh compile_vdoctor_skip_unused_prod_gcc
132-
- name: compile vup.v with -skip-unused and -prod
133-
run: v run ci/linux_ci.vsh compile_vup_skip_unused_prod_gcc
134-
- name: Test vlib modules with -skip-unused
135-
run: v run ci/linux_ci.vsh test_vlib_skip_unused_gcc
124+
- name: compile vdoctor.v with -prod
125+
run: v run ci/linux_ci.vsh compile_vdoctor_prod_gcc
126+
- name: compile vup.v with -prod
127+
run: v run ci/linux_ci.vsh compile_vup_prod_gcc
136128

137129
clang:
138130
runs-on: ubuntu-24.04
@@ -171,8 +163,6 @@ jobs:
171163
run: v run ci/linux_ci.vsh build_examples_clang
172164
- name: Build examples with -autofree
173165
run: v run ci/linux_ci.vsh build_examples_autofree_clang
174-
- name: Test vlib modules with -skip-unused
175-
run: v run ci/linux_ci.vsh test_vlib_skip_unused_clang
176166
- name: Build modules
177167
run: v run ci/linux_ci.vsh build_modules_clang
178168
- name: native machine code generation

.github/workflows/macos_ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,3 @@ jobs:
7474
run: v run ci/macos_ci.vsh test_password_input
7575
- name: Test readline
7676
run: v run ci/macos_ci.vsh test_readline
77-
- name: Test vlib modules with -skip-unused
78-
run: v run ci/macos_ci.vsh test_vlib_skip_unused

.github/workflows/puzzle_vibes_ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,8 @@ jobs:
5353
- name: Check PV compiles with -g
5454
run: cd puzzle_vibes && v -g .
5555

56-
- name: Check PV compiles with -skip-unused
57-
run: cd puzzle_vibes && v -skip-unused .
58-
59-
- name: Check PV compiles with both -g and -skip-unused
60-
run: cd puzzle_vibes && v -g -skip-unused .
61-
6256
- name: Check PV compiles with -prod
6357
run: cd puzzle_vibes && v -prod .
6458

65-
- name: Check PV compiles with -prod and -g and -skip-unused
66-
run: cd puzzle_vibes && v -prod -g -skip-unused .
59+
- name: Check PV compiles with -prod and -g
60+
run: cd puzzle_vibes && v -prod -g .

.github/workflows/release_ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,16 @@ jobs:
5454
if: runner.os != 'Windows'
5555
run: |
5656
make
57-
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -skip-unused -prod -o v cmd/v
58-
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -skip-unused -prod cmd/tools/vup.v
59-
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -skip-unused -prod cmd/tools/vdoctor.v
57+
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -prod -o v cmd/v
58+
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -prod cmd/tools/vup.v
59+
./v -cc ${{ matrix.cc }} ${{ matrix.cflags }} -prod cmd/tools/vdoctor.v
6060
- name: Compile release binaries (Windows)
6161
if: runner.os == 'Windows'
6262
run: |
6363
./make.bat -msvc
64-
./v -skip-unused -prod -cc msvc -o cmd/vprod.exe cmd/v
65-
./v -skip-unused -prod -cc msvc cmd/tools/vup.v
66-
./v -skip-unused -prod -cc msvc cmd/tools/vdoctor.v
64+
./v -prod -cc msvc -o cmd/vprod.exe cmd/v
65+
./v -prod -cc msvc cmd/tools/vup.v
66+
./v -prod -cc msvc cmd/tools/vdoctor.v
6767
del *.exe
6868
del *.tmp.obj
6969
move cmd/vprod.exe v.exe

.github/workflows/v_apps_and_modules_compile_ci.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,18 @@ jobs:
7676
v retry -- v install vab
7777
echo "Build vab"
7878
v ~/.vmodules/vab
79-
echo "Build vab with -gc boehm -skip-unused"
80-
v -g -gc boehm -skip-unused ~/.vmodules/vab
79+
echo "Build vab with -g"
80+
v -g ~/.vmodules/vab
8181
8282
- name: Build vlang/ved
8383
if: ${{ !cancelled() && steps.build.outcome == 'success' }}
8484
run: |
8585
v retry -- git clone --depth 1 https://github.com/vlang/ved
8686
cd ved && v -o ved .
87+
echo "Build"
88+
v .
8789
echo "Build with -autofree ..."
8890
v -autofree .
89-
echo "Build with -skip-unused ..."
90-
v -skip-unused .
9191
echo "Build with -prod ..."
9292
v -prod .
9393
cd ..
@@ -97,15 +97,15 @@ jobs:
9797
run: |
9898
v retry -- v install pdf
9999
echo "PDF examples should compile"
100-
v -skip-unused should-compile-all ~/.vmodules/pdf/examples
100+
v should-compile-all ~/.vmodules/pdf/examples
101101
102102
- name: Build vlang/libsodium
103103
if: ${{ !cancelled() && steps.build.outcome == 'success' }}
104104
run: |
105105
echo "Install the libsodium wrapper"
106106
v retry -- v install libsodium
107107
echo "Test libsodium"
108-
VJOBS=1 v -skip-unused test ~/.vmodules/libsodium
108+
VJOBS=1 v test ~/.vmodules/libsodium
109109
110110
- name: Build vlang/coreutils
111111
if: ${{ !cancelled() && steps.build.outcome == 'success' }}
@@ -126,7 +126,6 @@ jobs:
126126
v retry -- git clone https://github.com/vlang/gitly /tmp/gitly
127127
echo "Build Gitly"
128128
v -cc gcc /tmp/gitly
129-
v -skip-unused -cc gcc /tmp/gitly
130129
## echo "Build Gitly with -autofree"
131130
## v -cc gcc -autofree /tmp/gitly
132131
echo "Compile gitly.css from gitly.scss"
@@ -141,7 +140,6 @@ jobs:
141140
v retry -- v install ui
142141
v -no-parallel ~/.vmodules/ui/examples/rectangles.v
143142
v -no-parallel ~/.vmodules/ui/examples/users.v
144-
# v -skip-unused -no-parallel ~/.vmodules/ui/examples/users.v
145143
# v run ~/.vmodules/ui/examples/build_examples.vsh
146144
147145
- name: Build vlang/v-analyzer
@@ -177,7 +175,6 @@ jobs:
177175
v retry -- git clone --depth=1 https://github.com/vlang/go2v /tmp/go2v/
178176
echo "Build Go2V"
179177
v /tmp/go2v/
180-
v -skip-unused /tmp/go2v/
181178
echo "Run Go2V tests"
182179
VJOBS=1 v test /tmp/go2v/
183180
@@ -208,7 +205,6 @@ jobs:
208205
v -shared ~/.vmodules/msgpack/
209206
echo "Run msgpack tests"
210207
v test ~/.vmodules/msgpack/
211-
v -skip-unused test ~/.vmodules/msgpack/
212208
echo "MessagePack examples should compile"
213209
v should-compile-all ~/.vmodules/msgpack/examples
214210
@@ -219,8 +215,8 @@ jobs:
219215
# v retry -- v install nedpals.vex
220216
# echo "Compile all of the Vex examples"
221217
# v should-compile-all ~/.vmodules/nedpals/vex/examples
222-
# echo "Compile the simple Vex example with -skip-unused"
223-
# v -skip-unused ~/.vmodules/nedpals/vex/examples/simple_example.v
218+
# echo "Compile the simple Vex example"
219+
# v ~/.vmodules/nedpals/vex/examples/simple_example.v
224220
# echo "Run Vex Tests"
225221
# v test ~/.vmodules/nedpals/vex
226222

@@ -238,4 +234,4 @@ jobs:
238234
run: |
239235
v retry -- v install markdown
240236
v retry -- git clone --depth 1 https://github.com/vlang/vpm
241-
cd vpm && v . && v -skip-unused .
237+
cd vpm && v .

.github/workflows/windows_ci.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ jobs:
7171
run: v build-examples
7272
- name: v2 self compilation
7373
run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
74-
- name: compile vdoctor.v with -skip-unused and -prod
75-
run: v -showcc -skip-unused -prod cmd/tools/vdoctor.v
76-
- name: compile vup.v with -skip-unused and -prod
77-
run: v -showcc -skip-unused -prod cmd/tools/vup.v
78-
- name: Test vlib modules with -skip-unused
79-
run: v -skip-unused test vlib/builtin/ vlib/math vlib/flag/ vlib/os/ vlib/strconv/
74+
- name: compile vdoctor.v with -prod
75+
run: v -showcc -prod cmd/tools/vdoctor.v
76+
- name: compile vup.v with -prod
77+
run: v -showcc -prod cmd/tools/vup.v
8078

8179
msvc:
8280
runs-on: windows-2019
@@ -96,8 +94,8 @@ jobs:
9694
run: v -cflags /WX self
9795
- name: All code is formatted
9896
run: v test-cleancode
99-
- name: Test -cc msvc -gc boehm works
100-
run: v -no-retry-compilation -gc boehm run examples/hello_world.v
97+
- name: Test -cc msvc works
98+
run: v -no-retry-compilation run examples/hello_world.v
10199
- name: Install dependencies
102100
run: |
103101
v retry -- v setup-freetype
@@ -126,8 +124,6 @@ jobs:
126124
run: v build-examples
127125
- name: v2 self compilation
128126
run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
129-
- name: Test vlib modules with -skip-unused
130-
run: v -skip-unused test vlib/builtin/ vlib/math vlib/flag/ vlib/os/ vlib/strconv/
131127

132128
tcc:
133129
runs-on: windows-2019
@@ -180,10 +176,6 @@ jobs:
180176
run: v build-examples
181177
- name: v2 self compilation
182178
run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v && .\v3.exe -o v4.exe cmd/v
183-
- name: v2 self compilation with -gc boehm
184-
run: v -o v2.exe -gc boehm cmd/v && .\v2.exe -o v3.exe -gc boehm cmd/v && .\v3.exe -o v4.exe -gc boehm cmd/v
185-
- name: Test vlib modules with -skip-unused
186-
run: v -skip-unused test vlib/builtin/ vlib/math vlib/flag/ vlib/os/ vlib/strconv/
187179

188180
## tcc32
189181
# - name: Build with make.bat -tcc32

ci/linux_ci.vsh

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ fn self_tests() {
2929
}
3030
}
3131
32-
fn test_vlib_skip_unused() {
33-
exec('v -skip-unused test vlib/builtin/ vlib/math vlib/flag/ vlib/os/ vlib/strconv/')
34-
}
35-
3632
fn build_examples() {
3733
if common.is_github_job {
3834
exec('v build-examples')
@@ -75,14 +71,6 @@ fn v_self_compilation_tcc() {
7571
exec('v -o v2 cmd/v && ./v2 -o v3 cmd/v && ./v3 -o v4 cmd/v')
7672
}
7773
78-
fn v_self_compilation_skip_unused_tcc() {
79-
exec('v -skip-unused -o v2 cmd/v && ./v2 -skip-unused -o v3 cmd/v && ./v3 -skip-unused -o v4 cmd/v')
80-
}
81-
82-
fn test_vlib_skip_unused_tcc() {
83-
test_vlib_skip_unused()
84-
}
85-
8674
fn v_doctor_tcc() {
8775
v_doctor()
8876
}
@@ -242,10 +230,6 @@ fn v_self_compilation_parallel_cc_gcc() {
242230
exec('v -o v2 -parallel-cc cmd/v')
243231
}
244232
245-
fn test_vlib_skip_unused_gcc() {
246-
test_vlib_skip_unused()
247-
}
248-
249233
fn build_modules_gcc() {
250234
exec('v build-module vlib/os')
251235
exec('v build-module vlib/builtin')
@@ -268,12 +252,12 @@ fn native_machine_code_generation_gcc() {
268252
exec('cd cmd/tools && ../../vprod -backend native -o 1m 1m.v && ./1m && ls')
269253
}
270254
271-
fn compile_vdoctor_skip_unused_prod_gcc() {
272-
exec('v -showcc -skip-unused -cc gcc -prod cmd/tools/vdoctor.v')
255+
fn compile_vdoctor_prod_gcc() {
256+
exec('v -showcc -cc gcc -prod cmd/tools/vdoctor.v')
273257
}
274258
275-
fn compile_vup_skip_unused_prod_gcc() {
276-
exec('v -showcc -skip-unused -cc gcc -prod cmd/tools/vup.v')
259+
fn compile_vup_prod_gcc() {
260+
exec('v -showcc -cc gcc -prod cmd/tools/vup.v')
277261
}
278262
279263
//
@@ -344,10 +328,6 @@ fn build_examples_autofree_clang() {
344328
exec('v -autofree -experimental -o tetris examples/tetris/tetris.v')
345329
}
346330
347-
fn test_vlib_skip_unused_clang() {
348-
test_vlib_skip_unused()
349-
}
350-
351331
fn build_modules_clang() {
352332
exec('v build-module vlib/os')
353333
exec('v build-module vlib/builtin')
@@ -380,8 +360,6 @@ const all_tasks = {
380360
'install_dependencies_for_examples_and_tools_tcc': Task{install_dependencies_for_examples_and_tools_tcc, 'Install deps for examples/tools (tcc)'}
381361
'test_v_to_c_tcc': Task{test_v_to_c_tcc, 'Test v->c with tcc'}
382362
'v_self_compilation_tcc': Task{v_self_compilation_tcc, 'V self compilation (tcc)'}
383-
'v_self_compilation_skip_unused_tcc': Task{v_self_compilation_skip_unused_tcc, 'V self compilation with -skip-unused (tcc)'}
384-
'test_vlib_skip_unused_tcc': Task{test_vlib_skip_unused_tcc, 'Test vlib modules with -skip-unused (tcc)'}
385363
'v_doctor_tcc': Task{v_doctor_tcc, 'v doctor (tcc)'}
386364
'verify_v_test_works_tcc': Task{verify_v_test_works_tcc, 'Verify `v test` works (tcc)'}
387365
'test_pure_v_math_module_tcc': Task{test_pure_v_math_module_tcc, 'Test pure V math module (tcc)'}
@@ -417,11 +395,10 @@ const all_tasks = {
417395
'build_blog_autofree_gcc': Task{build_blog_autofree_gcc, 'Build blog tutorial with -autofree (gcc)'}
418396
'build_option_test_autofree_gcc': Task{build_option_test_autofree_gcc, 'Build option_test.c.v with -autofree (gcc)'}
419397
'v_self_compilation_parallel_cc_gcc': Task{v_self_compilation_parallel_cc_gcc, 'V self compilation with -parallel-cc (gcc)'}
420-
'test_vlib_skip_unused_gcc': Task{test_vlib_skip_unused_gcc, 'Test vlib modules with -skip-unused (gcc)'}
421398
'build_modules_gcc': Task{build_modules_gcc, 'Build modules (gcc)'}
422399
'native_machine_code_generation_gcc': Task{native_machine_code_generation_gcc, 'native machine code generation (gcc)'}
423-
'compile_vdoctor_skip_unused_prod_gcc': Task{compile_vdoctor_skip_unused_prod_gcc, 'compile vdoctor with -skip-unused -prod (gcc)'}
424-
'compile_vup_skip_unused_prod_gcc': Task{compile_vup_skip_unused_prod_gcc, 'compile vup with -skip-unused -prod (gcc)'}
400+
'compile_vdoctor_prod_gcc': Task{compile_vdoctor_prod_gcc, 'compile vdoctor with -prod (gcc)'}
401+
'compile_vup_prod_gcc': Task{compile_vup_prod_gcc, 'compile vup with -prod (gcc)'}
425402
// clang tasks
426403
'all_code_is_formatted_clang': Task{all_code_is_formatted_clang, 'All code is formatted (clang)'}
427404
'install_dependencies_for_examples_and_tools_clang': Task{install_dependencies_for_examples_and_tools_clang, 'Install deps for examples/tools (clang)'}
@@ -437,7 +414,6 @@ const all_tasks = {
437414
'self_tests_cstrict_clang': Task{self_tests_cstrict_clang, 'Self tests (-cstrict) (clang)'}
438415
'build_examples_clang': Task{build_examples_clang, 'Build examples (clang)'}
439416
'build_examples_autofree_clang': Task{build_examples_autofree_clang, 'Build examples with -autofree (clang)'}
440-
'test_vlib_skip_unused_clang': Task{test_vlib_skip_unused_clang, 'Test vlib modules with -skip-unused (clang)'}
441417
'build_modules_clang': Task{build_modules_clang, 'Build modules (clang)'}
442418
'native_machine_code_generation_clang': Task{native_machine_code_generation_clang, 'native machine code generation (clang)'}
443419
}

ci/macos_ci.vsh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ fn test_readline() {
111111
exec('v -progress test examples/readline/')
112112
}
113113
114-
fn test_vlib_skip_unused() {
115-
exec('v -skip-unused -progress test vlib/builtin/ vlib/math vlib/flag/ vlib/os/ vlib/strconv/')
116-
}
117-
118114
const all_tasks = {
119115
'test_symlink': Task{test_symlink, 'Test symlink'}
120116
'test_cross_compilation': Task{test_cross_compilation, 'Test cross compilation to Linux'}
@@ -136,7 +132,6 @@ const all_tasks = {
136132
'v_self_compilation_parallel_cc': Task{v_self_compilation_parallel_cc, 'V self compilation with -parallel-cc'}
137133
'test_password_input': Task{test_password_input, 'Test password input'}
138134
'test_readline': Task{test_readline, 'Test readline'}
139-
'test_vlib_skip_unused': Task{test_vlib_skip_unused, 'Test vlib modules with -skip-unused'}
140135
}
141136
142137
common.run(all_tasks)

0 commit comments

Comments
 (0)