From ac82be07d8ed9795caa0778f0f8577b3934d1d86 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Sat, 20 Feb 2021 09:08:53 -0800 Subject: [PATCH] refs #17107 use 2 instead of 3 parallel jobs for openbsd (#17108) --- .builds/openbsd_0.yml | 2 +- .builds/openbsd_1.yml | 2 +- .builds/openbsd_2.yml | 34 ---------------------------------- tools/ci_generate.nim | 3 ++- 4 files changed, 4 insertions(+), 37 deletions(-) delete mode 100644 .builds/openbsd_2.yml diff --git a/.builds/openbsd_0.yml b/.builds/openbsd_0.yml index 278cb3de9d..146ad81657 100644 --- a/.builds/openbsd_0.yml +++ b/.builds/openbsd_0.yml @@ -13,7 +13,7 @@ packages: sources: - https://github.com/nim-lang/Nim environment: - NIM_TESTAMENT_BATCH: "0_3" + NIM_TESTAMENT_BATCH: "0_2" CC: /usr/bin/clang tasks: - setup: | diff --git a/.builds/openbsd_1.yml b/.builds/openbsd_1.yml index d3f0c8795d..ad37340083 100644 --- a/.builds/openbsd_1.yml +++ b/.builds/openbsd_1.yml @@ -13,7 +13,7 @@ packages: sources: - https://github.com/nim-lang/Nim environment: - NIM_TESTAMENT_BATCH: "1_3" + NIM_TESTAMENT_BATCH: "1_2" CC: /usr/bin/clang tasks: - setup: | diff --git a/.builds/openbsd_2.yml b/.builds/openbsd_2.yml deleted file mode 100644 index 4b63e914d7..0000000000 --- a/.builds/openbsd_2.yml +++ /dev/null @@ -1,34 +0,0 @@ -## do not edit directly; auto-generated by `nim r tools/ci_generate.nim` - -image: openbsd/latest -packages: -- gmake -- sqlite3 -- node -- boehm-gc -- pcre -- sfml -- sdl2 -- libffi -sources: -- https://github.com/nim-lang/Nim -environment: - NIM_TESTAMENT_BATCH: "2_3" - CC: /usr/bin/clang -tasks: -- setup: | - cd Nim - git clone --depth 1 -q https://github.com/nim-lang/csources.git - gmake -C csources -j $(sysctl -n hw.ncpuonline) - bin/nim c koch - echo 'export PATH=$HOME/Nim/bin:$PATH' >> $HOME/.buildenv -- test: | - cd Nim - if ! ./koch runCI; then - nim c -r tools/ci_testresults.nim - exit 1 - fi -triggers: -- action: email - condition: failure - to: Andreas Rumpf diff --git a/tools/ci_generate.nim b/tools/ci_generate.nim index dba10d74af..d13f28c330 100644 --- a/tools/ci_generate.nim +++ b/tools/ci_generate.nim @@ -51,7 +51,8 @@ triggers: """ proc main()= - let num = 3 + # not too large to be resource friendly, refs bug #17107 + let num = 2 # if you reduce this, make sure to remove files that shouldn't be generated, # or better, do the cleanup logic here e.g.: `rm .builds/openbsd_*` for i in 0..