Skip to content

Commit 974ff54

Browse files
committed
ci: stop unsetting VFLAGS completely in ci/linux_ci.vsh and ci/macos_ci.vsh
1 parent f7c611c commit 974ff54

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

ci/linux_ci.vsh

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import common { Task, exec, unset }
1+
import common { Task, exec }
22

3-
//
43
// Shared tasks/helpers
5-
//
64
fn all_code_is_formatted() {
75
if common.is_github_job {
86
exec('v -silent test-cleancode')
@@ -50,10 +48,7 @@ fn build_v_with_prealloc() {
5048
exec('./v4 -d debug_malloc -d debug_realloc -o vdebug1 cmd/v')
5149
}
5250
53-
//
5451
// TCC job tasks
55-
//
56-
5752
fn install_dependencies_for_examples_and_tools_tcc() {
5853
if common.is_github_job {
5954
exec('.github/workflows/disable_azure_mirror.sh')
@@ -133,8 +128,6 @@ fn build_fast_tcc() {
133128
}
134129
135130
fn v_self_compilation_usecache_tcc() {
136-
unset('VFLAGS')
137-
138131
exec('v wipe-cache')
139132
exec('v -usecache examples/hello_world.v')
140133
exec('./examples/hello_world')
@@ -170,10 +163,7 @@ fn test_leak_detector_not_active_tcc() {
170163
exec('[ "$(stat -c %s leaks.txt)" = "0" ]')
171164
}
172165
173-
//
174166
// GCC job tasks
175-
//
176-
177167
fn all_code_is_formatted_gcc() {
178168
all_code_is_formatted()
179169
}
@@ -209,8 +199,6 @@ fn v_self_compilation_gcc() {
209199
}
210200
211201
fn v_self_compilation_usecache_gcc() {
212-
unset('VFLAGS')
213-
214202
exec('v wipe-cache')
215203
exec('v -usecache examples/hello_world.v')
216204
exec('examples/hello_world')
@@ -293,10 +281,7 @@ fn compile_vup_prod_gcc() {
293281
exec('v -showcc -cc gcc -prod cmd/tools/vup.v')
294282
}
295283
296-
//
297284
// Clang job tasks
298-
//
299-
300285
fn all_code_is_formatted_clang() {
301286
all_code_is_formatted()
302287
}
@@ -332,8 +317,6 @@ fn v_self_compilation_clang() {
332317
}
333318
334319
fn v_self_compilation_usecache_clang() {
335-
unset('VFLAGS')
336-
337320
exec('v wipe-cache')
338321
exec('v -usecache examples/hello_world.v')
339322
exec('./examples/hello_world')
@@ -416,9 +399,7 @@ fn native_cross_compilation_to_macos() {
416399
exec('rm -f hw.macos')
417400
}
418401
419-
//
420402
// Collect all tasks
421-
//
422403
const all_tasks = {
423404
'build_v_with_prealloc': Task{build_v_with_prealloc, 'Build V with prealloc'}
424405
// tcc tasks

ci/macos_ci.vsh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import common { Task, exec, unset }
1+
import common { Task, exec }
22

33
fn test_symlink() {
44
exec('v symlink')
@@ -98,7 +98,6 @@ fn build_v_with_prealloc() {
9898
}
9999
100100
fn v_self_compilation_usecache() {
101-
unset('VFLAGS')
102101
exec('v -usecache examples/hello_world.v')
103102
exec('./examples/hello_world')
104103
exec('v -o v2 -usecache cmd/v')

0 commit comments

Comments
 (0)