From 88ef0a75e2cda7d0b61b48b88a8d92934e503619 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Wed, 6 May 2020 15:10:41 +0300 Subject: [PATCH] ci: pass V_CI_MUSL=1 on musl CI jobs --- .github/workflows/ci.yml | 3 +++ vlib/v/tests/valgrind/valgrind_test.v | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbfdb89ed0..ed712ac3a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,8 @@ jobs: alpine-docker-musl-gcc: name: alpine-musl runs-on: ubuntu-latest + env: + V_CI_MUSL: 1 steps: - name: Checkout @@ -208,6 +210,7 @@ jobs: runs-on: ubuntu-18.04 env: VFLAGS: -cc musl-gcc + V_CI_MUSL: 1 steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 diff --git a/vlib/v/tests/valgrind/valgrind_test.v b/vlib/v/tests/valgrind/valgrind_test.v index ea4ea99e56..5c26b9f658 100644 --- a/vlib/v/tests/valgrind/valgrind_test.v +++ b/vlib/v/tests/valgrind/valgrind_test.v @@ -12,6 +12,10 @@ fn test_all() { eprintln('You can still do it by setting FORCE_VALGRIND_TEST=1 .') exit(0) } + if os.getenv('V_CI_MUSL').len > 0 { + eprintln('This test is disabled for musl.') + exit(0) + } bench_message := 'memory leak checking with valgrind' mut bench := benchmark.new_benchmark() eprintln(term.header(bench_message, '-'))