From dfa2d63616334fd5b623642ab357a6d6f2f471d3 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Tue, 17 May 2022 19:48:37 +0300 Subject: [PATCH] ci: use VJOBS=1 for the macos v test-cleancode task too; cleanup periodic.yml --- .github/workflows/ci.yml | 2 +- .github/workflows/periodic.yml | 67 +++++++++++++++++----------------- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61b36441c6..29cbc8abdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -194,7 +194,7 @@ jobs: ./v cmd/tools/test_if_v_test_system_works.v ./cmd/tools/test_if_v_test_system_works - name: All code is formatted - run: ./v test-cleancode + run: VJOBS=1 ./v test-cleancode - name: Self tests run: VJOBS=1 ./v test-self - name: Build examples diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml index c23e41322d..32eddaa8f9 100644 --- a/.github/workflows/periodic.yml +++ b/.github/workflows/periodic.yml @@ -2,57 +2,56 @@ name: Periodic on: schedule: - - cron: '0 */2 * * *' + - cron: '0 */6 * * *' jobs: network-tests-ubuntu: runs-on: ubuntu-20.04 timeout-minutes: 30 env: - V_CI_PERIODIC: 1 + V_CI_PERIODIC: 1 steps: - - uses: actions/checkout@v2 - - name: Install dependencies - run: sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev valgrind - - name: Build v - run: make -j4 - - name: Symlink V - run: sudo ./v symlink -## - name: Run network tests -## run: ./v -d network test vlib/net + - uses: actions/checkout@v2 + - name: Install dependencies 1 + run: sudo apt-get install --quiet -y libssl-dev sqlite3 libsqlite3-dev + - name: Build v + run: make + - name: Symlink V + run: sudo ./v symlink + ## - name: Run network tests + ## run: ./v -d network test vlib/net network-tests-macos: runs-on: macOS-latest timeout-minutes: 30 env: - V_CI_PERIODIC: 1 + V_CI_PERIODIC: 1 steps: - - uses: actions/checkout@v2 - - name: Setup openssl library path - run: export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" - - name: Build V - run: make -j4 - - name: Symlink V - run: sudo ./v symlink - - name: Ensure thirdparty/cJSON/cJSON.o is compiled, before running tests. - run: ./v examples/json.v -## - name: Run network tests -## run: ./v -d network test vlib/net - + - uses: actions/checkout@v2 + - name: Setup openssl library path + run: export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" + - name: Build V + run: make + - name: Symlink V + run: sudo ./v symlink + - name: Ensure thirdparty/cJSON/cJSON.o is compiled, before running tests. + run: ./v examples/json.v + ## - name: Run network tests + ## run: ./v -d network test vlib/net network-windows-msvc: runs-on: windows-2019 timeout-minutes: 30 env: - V_CI_PERIODIC: 1 - VFLAGS: -cc msvc + V_CI_PERIODIC: 1 + VFLAGS: -cc msvc steps: - - uses: actions/checkout@v2 - - name: Build - run: | - echo %VFLAGS% - echo $VFLAGS - .\make.bat -msvc -## - name: Run network tests -## run: .\v.exe -d network test vlib/net + - uses: actions/checkout@v2 + - name: Build + run: | + echo %VFLAGS% + echo $VFLAGS + .\make.bat -msvc + ## - name: Run network tests + ## run: .\v.exe -d network test vlib/net