From 3a09ccc80a2ace17823d0b4c7a193377b01ea8fc Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Sun, 15 May 2022 09:06:01 +0300 Subject: [PATCH] ci: restore .github/workflows/ to its state at cee7856, when all checks were done --- .github/workflows/ci.yml | 11 ++- .github/workflows/ci_bootstrapping_works.yml | 10 ++- .github/workflows/ci_cross.yml | 10 ++- .github/workflows/ci_sanitized.yml | 87 +++++-------------- .github/workflows/ci_v_benchmark.yml | 10 ++- .github/workflows/containers_ci.yml | 10 ++- .github/workflows/docs_ci.yml | 6 +- .github/workflows/gfx_ci.yml | 10 ++- .github/workflows/other_ci.yml | 6 -- .github/workflows/paths_ci.yml | 10 ++- .github/workflows/sdl_ci.yml | 10 ++- .github/workflows/toml_ci.yml | 10 ++- .../workflows/v_apps_and_modules_compile.yml | 10 ++- .github/workflows/vab_ci.yml | 10 ++- .github/workflows/vinix-kernel.yml | 12 ++- .github/workflows/websockets.yml | 10 ++- 16 files changed, 104 insertions(+), 128 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d09e7971b8..fcca993f42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,10 +1,12 @@ name: Code CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" concurrency: group: build-ci-${{ github.event.pull_request.number || github.sha }} @@ -31,6 +33,7 @@ jobs: run: | echo $VFLAGS make + ./v test-cleancode ./v -d debug_malloc -d debug_realloc -o v cmd/v ./v -cg -cstrict -o v cmd/v # Test v -realloc arena allocation diff --git a/.github/workflows/ci_bootstrapping_works.yml b/.github/workflows/ci_bootstrapping_works.yml index 55b2899e64..a7116ef83a 100644 --- a/.github/workflows/ci_bootstrapping_works.yml +++ b/.github/workflows/ci_bootstrapping_works.yml @@ -1,10 +1,12 @@ name: Bootstraping works on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: ubuntu: diff --git a/.github/workflows/ci_cross.yml b/.github/workflows/ci_cross.yml index dc9943ae75..bc1d8bb16c 100644 --- a/.github/workflows/ci_cross.yml +++ b/.github/workflows/ci_cross.yml @@ -1,10 +1,12 @@ name: Cross CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: diff --git a/.github/workflows/ci_sanitized.yml b/.github/workflows/ci_sanitized.yml index acbd70c5b5..8a738aab0c 100644 --- a/.github/workflows/ci_sanitized.yml +++ b/.github/workflows/ci_sanitized.yml @@ -13,7 +13,6 @@ name: Sanitized CI on: push: - branches: [master] paths: - '!**' - 'cmd/tools/vtest*' @@ -73,22 +72,7 @@ concurrency: cancel-in-progress: true jobs: - code-formatting-before-regression: - runs-on: ubuntu-20.04 - timeout-minutes: 15 - steps: - - uses: actions/checkout@v2 - - name: Environment info - run: echo $VFLAGS $GITHUB_SHA $GITHUB_REF - - name: Build local v - run: make - - name: v test-cleancode - run: ./v test-cleancode - - name: v test-fmt - run: ./v test-fmt - tests-sanitize-undefined-clang: - needs: [code-formatting-before-regression] runs-on: ubuntu-20.04 timeout-minutes: 180 env: @@ -107,19 +91,13 @@ 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 - ./v -cg -cstrict -o v cmd/v + run: make -j4 && ./v -cg -cstrict -o v cmd/v && ./v test-cleancode - 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] runs-on: ubuntu-20.04 timeout-minutes: 180 env: @@ -137,19 +115,13 @@ 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 - ./v -cg -cstrict -o v cmd/v + run: make -j4 && ./v -cg -cstrict -o v cmd/v && ./v test-cleancode - 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] runs-on: ubuntu-20.04 timeout-minutes: 180 env: @@ -168,22 +140,17 @@ 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 - ./v -cg -cstrict -o v cmd/v + run: make -j4 && ./v -cg -cstrict -o v cmd/v && ./v test-cleancode - 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] runs-on: windows-2019 timeout-minutes: 180 env: @@ -201,6 +168,7 @@ jobs: echo $VFLAGS .\make.bat -msvc .\v.exe self + .\v.exe test-cleancode ## - name: Install dependencies ## run: | ## .\v.exe setup-freetype @@ -210,7 +178,6 @@ jobs: ## .\v.exe -cflags "/fsanitize=address" test-self tests-sanitize-address-gcc: - needs: [code-formatting-before-regression] runs-on: ubuntu-20.04 timeout-minutes: 180 env: @@ -229,22 +196,17 @@ 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 - ./v -cg -cstrict -o v cmd/v + run: make -j4 && ./v -cg -cstrict -o v cmd/v && ./v test-cleancode - 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] runs-on: ubuntu-20.04 timeout-minutes: 180 env: @@ -263,16 +225,11 @@ 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 - ./v -cc clang -cg -cstrict -o v cmd/v + run: make -j4 && ./v -cc clang -cg -cstrict -o v cmd/v && ./v test-cleancode - 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 diff --git a/.github/workflows/ci_v_benchmark.yml b/.github/workflows/ci_v_benchmark.yml index 3ea143e044..ceea0f24e7 100644 --- a/.github/workflows/ci_v_benchmark.yml +++ b/.github/workflows/ci_v_benchmark.yml @@ -1,10 +1,12 @@ name: vlang benchmarks on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: run: diff --git a/.github/workflows/containers_ci.yml b/.github/workflows/containers_ci.yml index 538ff304d2..ec8123cd21 100644 --- a/.github/workflows/containers_ci.yml +++ b/.github/workflows/containers_ci.yml @@ -1,10 +1,12 @@ name: Containers CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" concurrency: group: build-containers-${{ github.event.pull_request.number || github.sha }} diff --git a/.github/workflows/docs_ci.yml b/.github/workflows/docs_ci.yml index af6405ffd8..8422e25b7d 100644 --- a/.github/workflows/docs_ci.yml +++ b/.github/workflows/docs_ci.yml @@ -2,11 +2,7 @@ name: Docs CI ### Run on *EVERY* commit. The documentation *SHOULD* stay valid, and ### the developers should receive early warning if they break it. -on: - workflow_run: - workflows: ["Other CI"] - types: - - completed +on: [push, pull_request] jobs: check-markdown: diff --git a/.github/workflows/gfx_ci.yml b/.github/workflows/gfx_ci.yml index 460b0de035..a7a31b3f3c 100644 --- a/.github/workflows/gfx_ci.yml +++ b/.github/workflows/gfx_ci.yml @@ -1,10 +1,12 @@ name: Graphics CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: gg-regressions: diff --git a/.github/workflows/other_ci.yml b/.github/workflows/other_ci.yml index 4e4ed7427b..bc2e260ba1 100644 --- a/.github/workflows/other_ci.yml +++ b/.github/workflows/other_ci.yml @@ -2,8 +2,6 @@ name: Other CI on: push: - branches: - - master paths-ignore: - "**.md" pull_request: @@ -16,7 +14,6 @@ concurrency: jobs: no-gpl-by-accident: - needs: [code-formatting] runs-on: ubuntu-20.04 timeout-minutes: 15 steps: @@ -42,7 +39,6 @@ jobs: run: ./v test-fmt performance-regressions: - needs: [code-formatting] runs-on: ubuntu-20.04 timeout-minutes: 15 env: @@ -67,7 +63,6 @@ jobs: run: cmd/tools/repeat --max_time 1501 --series 3 --count 20 --nmins 2 --nmaxs 5 --warmup 3 --fail_percent 10 -t 'cd {T} ; ./v -show-timings -o v.c cmd/v' . ./vmaster misc-tooling: - needs: [code-formatting] runs-on: ubuntu-20.04 timeout-minutes: 121 env: @@ -116,7 +111,6 @@ jobs: ./v should-compile-all examples/sokol/*.v examples/sokol/0?*/*.v parser-silent: - needs: [code-formatting] runs-on: ubuntu-20.04 timeout-minutes: 121 steps: diff --git a/.github/workflows/paths_ci.yml b/.github/workflows/paths_ci.yml index e6b9d372b8..e24050e8da 100644 --- a/.github/workflows/paths_ci.yml +++ b/.github/workflows/paths_ci.yml @@ -1,10 +1,12 @@ name: Path Testing CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" concurrency: group: build-paths-${{ github.event.pull_request.number || github.sha }} diff --git a/.github/workflows/sdl_ci.yml b/.github/workflows/sdl_ci.yml index d534bb3a28..f7f14ef780 100644 --- a/.github/workflows/sdl_ci.yml +++ b/.github/workflows/sdl_ci.yml @@ -1,10 +1,12 @@ name: sdl CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: v-compiles-sdl-examples: diff --git a/.github/workflows/toml_ci.yml b/.github/workflows/toml_ci.yml index 175b7a9a18..2d6da67d77 100644 --- a/.github/workflows/toml_ci.yml +++ b/.github/workflows/toml_ci.yml @@ -1,10 +1,12 @@ name: toml CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: toml-module-pass-external-test-suites: diff --git a/.github/workflows/v_apps_and_modules_compile.yml b/.github/workflows/v_apps_and_modules_compile.yml index 21ae0e35be..deb561d1ca 100644 --- a/.github/workflows/v_apps_and_modules_compile.yml +++ b/.github/workflows/v_apps_and_modules_compile.yml @@ -1,10 +1,12 @@ name: V Apps and Modules on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" concurrency: group: build-other-${{ github.event.pull_request.number || github.sha }} diff --git a/.github/workflows/vab_ci.yml b/.github/workflows/vab_ci.yml index 938e6d7f07..f1cb779b4c 100644 --- a/.github/workflows/vab_ci.yml +++ b/.github/workflows/vab_ci.yml @@ -1,10 +1,12 @@ name: vab CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: vab-compiles-v-examples: diff --git a/.github/workflows/vinix-kernel.yml b/.github/workflows/vinix-kernel.yml index 9922b1b961..ca94a74694 100644 --- a/.github/workflows/vinix-kernel.yml +++ b/.github/workflows/vinix-kernel.yml @@ -1,10 +1,14 @@ name: Build Vinix kernel on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + pull_request: + paths-ignore: + - "**.md" + push: + branches: + - master + paths-ignore: + - "**.md" jobs: vinix-build: diff --git a/.github/workflows/websockets.yml b/.github/workflows/websockets.yml index 010fc9eefa..05f5c3a20d 100644 --- a/.github/workflows/websockets.yml +++ b/.github/workflows/websockets.yml @@ -1,10 +1,12 @@ name: Websockets CI on: - workflow_run: - workflows: ["Other CI"] - types: - - completed + push: + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" jobs: websocket_tests: