Merge pull request #18 from spytheman/ci_fix_check.vsh

ci fix check.vsh

Author: mike-ward

.github/workflows/ci.yml

@@ -48,6 +48,8 @@ jobs:
         uses: vlang/setup-v@v1.4
         with:
           check-latest: true
+      - name: Install X11/GL development dependencies (headers and libs)
+        run: v retry -- sudo apt install libgl1-mesa-dri xvfb libxcursor-dev libxi-dev libxrandr-dev freeglut3-dev
       - name: Checkout the gui module
         uses: actions/checkout@v4
         with:

examples/_build.vsh

@@ -1,6 +1,7 @@
 #!/usr/bin/env -S v
 
-chdir(dir(@FILE))!
+unbuffer_stdout()
+chdir(@DIR)!
 
 output_dir := 'bin'
 if exists(output_dir) {
@@ -25,24 +26,32 @@ if exists(output_dir) {
 	}
 }
 
-dir_files := ls('.') or { [] }
+dir_files := ls('.') or { [] }.map(join_path_single(@DIR, it))
 files := dir_files.filter(file_ext(it) == '.v').sorted()
 if files.len == 0 {
 	println('no .v files found')
 	return
 }
 
+mut errors := []string{}
 for file in files {
-	p := 'v -prod ${file}'
-	print('${p:-30}')
-	flush()
 	_, name, _ := split_path(file)
 	output_file := join_path(output_dir, name)
-	result := execute('v -prod -o ${output_file} ${file}')
-	if result.exit_code != 0 {
-		println(' ⭕')
-		println(result.output)
+	cmd := 'v -prod -o ${output_file:-22s} ${file:-50s}'
+	print(cmd)
+	result := execute(cmd)
+	if result.exit_code == 0 {
+		println('✅')
 	} else {
-		println(' -> ${output_file}')
+		println('⭕')
+		println(result.output)
+		errors << cmd
+	}
+}
+if errors.len > 0 {
+	println('Encountered ${errors.len} error(s).')
+	for i, ecmd in errors {
+		println('   error ${i + 1}/${errors.len} for: `${ecmd}`')
 	}
+	exit(1)
 }

examples/_check.vsh

@@ -1,30 +1,31 @@
 #!/usr/bin/env -S v
 
 unbuffer_stdout()
+chdir(@DIR)!
 
-dir_files := ls(dir(@FILE)) or { [] }.map(join_path_single(dir(@FILE), it))
+dir_files := ls(@DIR) or { [] }.map(join_path_single(@DIR, it))
 files := dir_files.filter(file_ext(it) == '.v').sorted()
 if files.len == 0 {
 	println('no .v files found')
 	return
 }
 mut errors := []string{}
 for i, file in files {
-	p := 'v -check ${file} '
-	print('(${i + 1:02}/${files.len:02}) ${p:-70}')
-	result := execute('v -check ${file}')
+	cmd := 'v -check -N -W ${file}'
+	print('(${i + 1:02}/${files.len:02}) ${cmd:-70}')
+	result := execute(cmd)
 	if result.exit_code == 0 {
-		println(' ✅')
+		println('✅')
 	} else {
-		println(' ⭕')
+		println('⭕')
 		println(result.output)
-		errors << file
+		errors << cmd
 	}
 }
 if errors.len > 0 {
 	println('Encountered ${errors.len} error(s).')
-	for i, efile in errors {
-		println('   error ${i + 1}/${errors.len} for: `v -check ${efile}`')
+	for i, ecmd in errors {
+		println('   error ${i + 1}/${errors.len} for: `${ecmd}`')
 	}
 	exit(1)
 }