From 1f6849e89cee89217f55eebca58c944881b18659 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sat, 14 May 2022 20:29:56 +0300
Subject: [PATCH] ci: simplify ci_sanitized.yml

---
 .github/workflows/ci_sanitized.yml | 67 ++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci_sanitized.yml b/.github/workflows/ci_sanitized.yml
index 29e1985eb8..844b928660 100644
--- a/.github/workflows/ci_sanitized.yml
+++ b/.github/workflows/ci_sanitized.yml
@@ -83,7 +83,7 @@ jobs:
       - name: Environment info
         run: echo $VFLAGS $GITHUB_SHA $GITHUB_REF
       - name: Build local v
-        run: make -j4
+        run: make
       - name: v test-cleancode
         run: ./v test-cleancode
       - name: v test-fmt
@@ -109,11 +109,16 @@ jobs:
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
           sudo apt-get install clang
       - name: Build V
-        run: make -j4 && ./v -cg -cstrict -o v cmd/v
+        run: |
+          make
+          ./v -cg -cstrict -o v cmd/v
       - name: Self tests (-fsanitize=undefined)
-        run: ./v -cflags "-fsanitize=undefined" -o v2 cmd/v && ./v2 -cflags -fsanitize=undefined test-self
+        run: |
+          ./v -cflags "-fsanitize=undefined" -o v2 cmd/v
+          ./v2 -cflags -fsanitize=undefined test-self
       - name: Build examples (V compiled with -fsanitize=undefined)
-        run: ./v2 build-examples
+        run: |
+          ./v2 build-examples
 
   tests-sanitize-undefined-gcc:
     needs: [code-formatting-before-regression]
@@ -134,11 +139,16 @@ jobs:
           sudo apt-get install --quiet -y postgresql libpq-dev libssl-dev sqlite3 libsqlite3-dev valgrind
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
       - name: Build V
-        run: make -j4 && ./v -cg -cstrict -o v cmd/v
+        run: |
+          make
+          ./v -cg -cstrict -o v cmd/v
       - name: Self tests (-fsanitize=undefined)
-        run: ./v -cflags "-fsanitize=undefined" -o v2 cmd/v && ./v2 -cflags -fsanitize=undefined test-self
+        run: |
+          ./v  -cflags -fsanitize=undefined -o v2 cmd/v
+          ./v2 -cflags -fsanitize=undefined test-self
       - name: Build examples (V compiled with -fsanitize=undefined)
-        run: ./v2 build-examples
+        run: |
+          ./v2 build-examples
 
   tests-sanitize-address-clang:
     needs: [code-formatting-before-regression]
@@ -160,15 +170,19 @@ jobs:
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
           sudo apt-get install clang
       - name: Build V
-        run: make -j4 && ./v -cg -cstrict -o v cmd/v
+        run: |
+          make
+          ./v -cg -cstrict -o v cmd/v
       - name: Self tests (-fsanitize=address)
-        run: ASAN_OPTIONS=detect_leaks=0 ./v -cflags "-fsanitize=address,pointer-compare,pointer-subtract" test-self
+        run: |
+          ASAN_OPTIONS=detect_leaks=0 ./v -cflags "-fsanitize=address,pointer-compare,pointer-subtract" test-self
       - name: Self tests (V compiled with -fsanitize=address)
-        run:
-          ./v -cflags -fsanitize=address -o v cmd/v &&
+        run: |
+          ./v -cflags -fsanitize=address -o v cmd/v
           ASAN_OPTIONS=detect_leaks=0 ./v -cc tcc test-self -asan-compiler
       - name: Build examples (V compiled with -fsanitize=address)
-        run: ASAN_OPTIONS=detect_leaks=0 ./v build-examples
+        run: |
+          ASAN_OPTIONS=detect_leaks=0 ./v build-examples
 
   tests-sanitize-address-msvc:
     needs: [code-formatting-before-regression]
@@ -218,15 +232,19 @@ jobs:
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
           sudo apt-get install clang
       - name: Build V
-        run: make -j4 && ./v -cg -cstrict -o v cmd/v &&
+        run: |
+          make
+          ./v -cg -cstrict -o v cmd/v
       - name: Self tests (-fsanitize=address)
-        run: ASAN_OPTIONS=detect_leaks=0 ./v -cflags -fsanitize=address test-self
+        run: |
+          ASAN_OPTIONS=detect_leaks=0 ./v -cflags -fsanitize=address test-self
       - name: Self tests (V compiled with -fsanitize=address)
-        run:
-          ./v -cflags -fsanitize=address,pointer-compare,pointer-subtract -o v cmd/v &&
+        run: |
+          ./v -cflags -fsanitize=address,pointer-compare,pointer-subtract -o v cmd/v
           ASAN_OPTIONS=detect_leaks=0 ./v -cc tcc test-self -asan-compiler
       - name: Build examples (V compiled with -fsanitize=address)
-        run: ASAN_OPTIONS=detect_leaks=0 ./v build-examples
+        run: |
+          ASAN_OPTIONS=detect_leaks=0 ./v build-examples
 
   tests-sanitize-memory-clang:
     needs: [code-formatting-before-regression]
@@ -248,11 +266,16 @@ jobs:
           sudo apt-get install --quiet -y libfreetype6-dev  libxi-dev libxcursor-dev libgl-dev
           sudo apt-get install clang
       - name: Build V
-        run: make -j4 && ./v -cc clang -cg -cstrict -o v cmd/v
+        run: |
+          make
+          ./v -cc clang -cg -cstrict -o v cmd/v
       - name: Self tests (-fsanitize=memory)
-        run: ./v -cflags -fsanitize=memory test-self
+        run: |
+          ./v -cflags -fsanitize=memory test-self
       - name: Self tests (V compiled with -fsanitize=memory)
-        run:
-          ./v -cflags -fsanitize=memory -o v cmd/v && ./v -cc tcc test-self -msan-compiler
+        run: |
+          ./v -cflags -fsanitize=memory -o v cmd/v
+          ./v -cc tcc test-self -msan-compiler
       - name: Build examples (V compiled with -fsanitize=memory)
-        run: ./v build-examples
+        run: |
+          ./v build-examples