From 5d4679f8c2d692a8979f79c362c4d179f2d4b38c Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Sat, 30 Nov 2019 22:21:14 +0900 Subject: [PATCH 01/25] cirrus ci --- .cirrus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d5b1b26426..601b36081a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ cirrus_gcc_test_task: STDFLAG: -std=c++2a spec_script: nproc version_script: make -C test showcxxversion - test_script: cd test && make -j4 && make test + test_script: cd test && make -j$((`nproc`)) && make test #cirrus_use_gtest_task: # env: @@ -28,7 +28,7 @@ cirrus_osx_14_test_task: &osx_task env: STDFLAG: -std=c++14 version_script: make -C test showcxxversion - test_script: cd test && make -j4 && make test + test_script: cd test && make -j$((`nproc`)) && make test cirrus_osx_17_test_task: <<: *osx_task @@ -52,5 +52,5 @@ cirrus_freebsd_clang_test_task: #STDFLAG: -std=c++2a install_script: pkg install -y gmake version_script: gmake --version && gmake -C test showcxxversion - test_script: cd test && gmake -j4 && gmake test + test_script: cd test && gmake -j$((`nproc`)) && gmake test From 21cefe8962c5bb7f99339e18c7263603de58a68b Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 2 Dec 2019 10:12:06 +0900 Subject: [PATCH 02/25] update nproc for cirrus --- .cirrus.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 601b36081a..317327e751 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ cirrus_gcc_test_task: STDFLAG: -std=c++2a spec_script: nproc version_script: make -C test showcxxversion - test_script: cd test && make -j$((`nproc`)) && make test + test_script: cd test && make -j$((`nproc` * 2 / 3)) && make test #cirrus_use_gtest_task: # env: @@ -27,8 +27,9 @@ cirrus_osx_14_test_task: &osx_task # image: high-sierra-xcode-9.4.1 env: STDFLAG: -std=c++14 + spec_script: getconf _NPROCESSORS_ONLN version_script: make -C test showcxxversion - test_script: cd test && make -j$((`nproc`)) && make test + test_script: cd test && make -j$((`getconf _NPROCESSORS_ONLN`)) && make test cirrus_osx_17_test_task: <<: *osx_task @@ -51,6 +52,7 @@ cirrus_freebsd_clang_test_task: STDFLAG: -std=c++17 #STDFLAG: -std=c++2a install_script: pkg install -y gmake + spec_script: nproc version_script: gmake --version && gmake -C test showcxxversion test_script: cd test && gmake -j$((`nproc`)) && gmake test From 9b0ac2d6de7e0c457b1e2f446b870756d1535f88 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 2 Dec 2019 10:26:28 +0900 Subject: [PATCH 03/25] fix freebsd nproc --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 317327e751..d09a039aa2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,7 +52,7 @@ cirrus_freebsd_clang_test_task: STDFLAG: -std=c++17 #STDFLAG: -std=c++2a install_script: pkg install -y gmake - spec_script: nproc + spec_script: sysctl -n hw.ncpu version_script: gmake --version && gmake -C test showcxxversion - test_script: cd test && gmake -j$((`nproc`)) && gmake test + test_script: cd test && gmake -j$((`sysctl -n hw.ncpu`)) && gmake test From e70f37cc0b383108881a922c88e117e282a7e83c Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 2 Dec 2019 14:01:40 +0900 Subject: [PATCH 04/25] Update .cirrus.yml --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index d09a039aa2..bd17f64703 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,8 @@ cirrus_gcc_test_task: STDFLAG: -std=c++2a spec_script: nproc version_script: make -C test showcxxversion - test_script: cd test && make -j$((`nproc` * 2 / 3)) && make test + # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' + test_script: cd test && make -j$((`nproc` / 2)) && make test #cirrus_use_gtest_task: # env: From 8a79a74068c9fd9a0acdb524f5d131490967b645 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 2 Dec 2019 15:32:10 +0900 Subject: [PATCH 05/25] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index bd17f64703..7c3895f4b1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ cirrus_gcc_test_task: spec_script: nproc version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - test_script: cd test && make -j$((`nproc` / 2)) && make test + test_script: cd test && make -j$((`nproc` * 2 / 5)) && make test #cirrus_use_gtest_task: # env: From 06a7e0acfd2bbc9717eb32cd395e5ebcadcd7f6a Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 2 Dec 2019 17:49:22 +0900 Subject: [PATCH 06/25] -j4 --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7c3895f4b1..75f86ea1c4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ cirrus_gcc_test_task: spec_script: nproc version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - test_script: cd test && make -j$((`nproc` * 2 / 5)) && make test + test_script: cd test && make -j4 && make test #cirrus_use_gtest_task: # env: @@ -55,5 +55,5 @@ cirrus_freebsd_clang_test_task: install_script: pkg install -y gmake spec_script: sysctl -n hw.ncpu version_script: gmake --version && gmake -C test showcxxversion - test_script: cd test && gmake -j$((`sysctl -n hw.ncpu`)) && gmake test + test_script: cd test && gmake -j4 && gmake test From 593e3036c13e28f5dc9ca941e6424d587852733b Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 09:51:02 +0900 Subject: [PATCH 07/25] j8 --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 75f86ea1c4..f0682af3d9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ cirrus_gcc_test_task: spec_script: nproc version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - test_script: cd test && make -j4 && make test + test_script: cd test && make -j8 && make test #cirrus_use_gtest_task: # env: From f9ec6be2a4c6bb5ac812c13b9a779ddb1fce7f08 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 09:56:50 +0900 Subject: [PATCH 08/25] circleci build on feature branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26d5ea5cd0..3f7c2e81d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -120,6 +120,6 @@ workflows: only: - master - develop - #- /^feature.*/ + - /^feature.*/ - /^fix.*/ - /^circleci.*/ From b8bb6a7a24a35d90d7738b3ed982bea4adc95126 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 09:58:37 +0900 Subject: [PATCH 09/25] j nproc for circle ci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f7c2e81d0..85d22b9280 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: environment: CIRCLE_ARTIFACTS: /tmp/circleci-artifacts CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - MAKE_OPTION: -j4 OUTPUTXML=1 + MAKE_OPTION: -j$((`nproc`)) OUTPUTXML=1 MAKE_TARGET: all_tests MAKE_RUN_TARGET: run_all_tests steps: From 2499afa9081d3334286e1cc3a4757d6b79ea9c1a Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 10:07:46 +0900 Subject: [PATCH 10/25] split build and test --- .circleci/config.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 85d22b9280..c1da314990 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,19 +77,31 @@ jobs: environment: CXX: clang++ - run: - name: g++ test + name: g++ build command: | make clean case $CIRCLE_NODE_INDEX in 0) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O2 ;; 1) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Os ;; 2) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O3 ;; 3) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O4 ;; esac + working_directory: test + environment: + CXX: g++ + - run: + name: g++ test + command: | make $MAKE_RUN_TARGET working_directory: test environment: CXX: g++ - run: - name: clang++ test + name: clang++ build command: | make clean case $CIRCLE_NODE_INDEX in 0) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O2 ;; 1) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Os ;; 2) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O3 ;; 3) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Oz ;; esac + working_directory: test + environment: + CXX: clang++ + - run: + name: clang++ test + command: | make $MAKE_RUN_TARGET working_directory: test environment: From ccf161676fefaf36b9e051d7ac8d60bf78f345d5 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 10:08:13 +0900 Subject: [PATCH 11/25] j4 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1da314990..0145e3e7e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: environment: CIRCLE_ARTIFACTS: /tmp/circleci-artifacts CIRCLE_TEST_REPORTS: /tmp/circleci-test-results - MAKE_OPTION: -j$((`nproc`)) OUTPUTXML=1 + MAKE_OPTION: -j4 OUTPUTXML=1 MAKE_TARGET: all_tests MAKE_RUN_TARGET: run_all_tests steps: From c03b0314fffe474ee1b6d4e3f25e138a10a3cade Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 10:29:27 +0900 Subject: [PATCH 12/25] spec test --- .ci/spec.sh | 48 ++++++++++++++++++++++++++++++++++++++ .circleci/config.yml | 6 ++++- .cirrus.yml | 6 ++--- .github/workflows/main.yml | 2 +- 4 files changed, 57 insertions(+), 5 deletions(-) create mode 100755 .ci/spec.sh diff --git a/.ci/spec.sh b/.ci/spec.sh new file mode 100755 index 0000000000..6e00bd64b1 --- /dev/null +++ b/.ci/spec.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +lower() { + if [ $# -eq 0 ]; then + cat <&0 + elif [ $# -eq 1 ]; then + if [ -f "$1" -a -r "$1" ]; then + cat "$1" + else + echo "$1" + fi + else + return 1 + fi | tr "[:upper:]" "[:lower:]" +} + +ostype() { + uname | lower +} + +os_detect() { + export PLATFORM + case "$(ostype)" in + *'linux'*) PLATFORM='linux' ;; + *'darwin'*) PLATFORM='osx' ;; + *'bsd'*) PLATFORM='bsd' ;; + *'msys'*) PLATFORM='windows' ;; + *'cygwin'*) PLATFORM='windows' ;; + *) PLATFORM='unknown' ;; + esac +} + +os_detect + +if [ "$PLATFORM" = "linux" ]; then + nproc + free -m +fi + +if [ "$PLATFORM" = "osx" ]; then + getconf _NPROCESSORS_ONLN +fi + +if [ "$PLATFORM" = "bsd" ]; then + sysctl -n hw.ncpu +fi + + diff --git a/.circleci/config.yml b/.circleci/config.yml index 0145e3e7e7..e9dff879b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,11 @@ jobs: MAKE_RUN_TARGET: run_all_tests steps: - checkout - - run: nproc + - run: + name: spec + command: | + nproc + free -m - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS - restore_cache: &restore_cache keys: diff --git a/.cirrus.yml b/.cirrus.yml index f0682af3d9..9c2b347f3b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ cirrus_gcc_test_task: STDFLAG: -std=c++14 STDFLAG: -std=c++17 STDFLAG: -std=c++2a - spec_script: nproc + spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' test_script: cd test && make -j8 && make test @@ -28,7 +28,7 @@ cirrus_osx_14_test_task: &osx_task # image: high-sierra-xcode-9.4.1 env: STDFLAG: -std=c++14 - spec_script: getconf _NPROCESSORS_ONLN + spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion test_script: cd test && make -j$((`getconf _NPROCESSORS_ONLN`)) && make test @@ -53,7 +53,7 @@ cirrus_freebsd_clang_test_task: STDFLAG: -std=c++17 #STDFLAG: -std=c++2a install_script: pkg install -y gmake - spec_script: sysctl -n hw.ncpu + spec_script: sh ./.ci/spec.sh version_script: gmake --version && gmake -C test showcxxversion test_script: cd test && gmake -j4 && gmake test diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81c9cc2d90..0d2edb8ab3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: if: "! contains(github.event.head_commit.message, '[ci skip]')" steps: - run: | - nproc + sh ./.ci/spec.sh echo "${{ github.event.head_commit.message }}" llvm-basic-test: From 60c589b4bd39598c6450e5f642d8eb892898a9f9 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 12:54:35 +0900 Subject: [PATCH 13/25] Update main.yml --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d2edb8ab3..635b0a426a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,6 @@ jobs: if: "! contains(github.event.head_commit.message, '[ci skip]')" steps: - run: | - sh ./.ci/spec.sh echo "${{ github.event.head_commit.message }}" llvm-basic-test: From c1a36060bc222e1f9316c8f35f00d78c7d76784d Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 13:46:20 +0900 Subject: [PATCH 14/25] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 9c2b347f3b..07235c86a4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ cirrus_gcc_test_task: spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - test_script: cd test && make -j8 && make test + test_script: cd test && make -j12 && make test #cirrus_use_gtest_task: # env: From b5aa2356f4b62163393656fc08cb2b5c8eba9b54 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 3 Dec 2019 13:53:50 +0900 Subject: [PATCH 15/25] Update .cirrus.yml --- .cirrus.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 07235c86a4..c4e367416f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,8 @@ cirrus_gcc_test_task: spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - test_script: cd test && make -j12 && make test + build_script: make -C test -j12 + test_script: make -C test test #cirrus_use_gtest_task: # env: @@ -30,7 +31,8 @@ cirrus_osx_14_test_task: &osx_task STDFLAG: -std=c++14 spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion - test_script: cd test && make -j$((`getconf _NPROCESSORS_ONLN`)) && make test + build_script: make -C test -j$((`getconf _NPROCESSORS_ONLN`)) + test_script : make -C test test cirrus_osx_17_test_task: <<: *osx_task @@ -55,5 +57,7 @@ cirrus_freebsd_clang_test_task: install_script: pkg install -y gmake spec_script: sh ./.ci/spec.sh version_script: gmake --version && gmake -C test showcxxversion - test_script: cd test && gmake -j4 && gmake test + build_script: gmake -C test -j4 + test_script : gmake -C test test + From 6186059078d9e243e4604fcbb15cfcb0ec82a6a0 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Wed, 4 Dec 2019 10:04:48 +0900 Subject: [PATCH 16/25] update --- .../template-make-test-steps.yml | 1 - .ci/spec.sh | 48 ------------------- .cirrus.yml | 6 +-- .travis.yml | 1 - peak_flow.yml | 1 - 5 files changed, 1 insertion(+), 56 deletions(-) delete mode 100755 .ci/spec.sh diff --git a/.ci/azure_pipelines/template-make-test-steps.yml b/.ci/azure_pipelines/template-make-test-steps.yml index 50a6c012ee..a1fd157ee1 100644 --- a/.ci/azure_pipelines/template-make-test-steps.yml +++ b/.ci/azure_pipelines/template-make-test-steps.yml @@ -12,7 +12,6 @@ parameters: steps: - script: | - nproc ulimit -c unlimited && ulimit -a mkdir -p ~/.config/apport/ echo [main] > ~/.config/apport/settings diff --git a/.ci/spec.sh b/.ci/spec.sh deleted file mode 100755 index 6e00bd64b1..0000000000 --- a/.ci/spec.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -lower() { - if [ $# -eq 0 ]; then - cat <&0 - elif [ $# -eq 1 ]; then - if [ -f "$1" -a -r "$1" ]; then - cat "$1" - else - echo "$1" - fi - else - return 1 - fi | tr "[:upper:]" "[:lower:]" -} - -ostype() { - uname | lower -} - -os_detect() { - export PLATFORM - case "$(ostype)" in - *'linux'*) PLATFORM='linux' ;; - *'darwin'*) PLATFORM='osx' ;; - *'bsd'*) PLATFORM='bsd' ;; - *'msys'*) PLATFORM='windows' ;; - *'cygwin'*) PLATFORM='windows' ;; - *) PLATFORM='unknown' ;; - esac -} - -os_detect - -if [ "$PLATFORM" = "linux" ]; then - nproc - free -m -fi - -if [ "$PLATFORM" = "osx" ]; then - getconf _NPROCESSORS_ONLN -fi - -if [ "$PLATFORM" = "bsd" ]; then - sysctl -n hw.ncpu -fi - - diff --git a/.cirrus.yml b/.cirrus.yml index c4e367416f..251ba449dc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,10 +8,9 @@ cirrus_gcc_test_task: STDFLAG: -std=c++14 STDFLAG: -std=c++17 STDFLAG: -std=c++2a - spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - build_script: make -C test -j12 + build_script: make -C test -j12 test_script: make -C test test #cirrus_use_gtest_task: @@ -29,7 +28,6 @@ cirrus_osx_14_test_task: &osx_task # image: high-sierra-xcode-9.4.1 env: STDFLAG: -std=c++14 - spec_script: sh ./.ci/spec.sh version_script: make -C test showcxxversion build_script: make -C test -j$((`getconf _NPROCESSORS_ONLN`)) test_script : make -C test test @@ -55,9 +53,7 @@ cirrus_freebsd_clang_test_task: STDFLAG: -std=c++17 #STDFLAG: -std=c++2a install_script: pkg install -y gmake - spec_script: sh ./.ci/spec.sh version_script: gmake --version && gmake -C test showcxxversion build_script: gmake -C test -j4 test_script : gmake -C test test - diff --git a/.travis.yml b/.travis.yml index cb508f0b0d..46a8172c7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,6 @@ addons: before_install: - | if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then - nproc ulimit -c unlimited sudo bash -c 'echo "core_x_%e" > /proc/sys/kernel/core_pattern' fi diff --git a/peak_flow.yml b/peak_flow.yml index 423c611c97..d4dab6e8c9 100644 --- a/peak_flow.yml +++ b/peak_flow.yml @@ -1,7 +1,6 @@ before_script: - cat /proc/cpuinfo || true - cat /proc/meminfo || true - - nproc - gcc --version || true - clang --version || true script: From 90bb8abd70f19c8aa02b6e4841c1a3ae78a2cd38 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Wed, 4 Dec 2019 12:00:08 +0900 Subject: [PATCH 17/25] Update .cirrus.yml --- .cirrus.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 251ba449dc..de87b75543 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,7 +10,7 @@ cirrus_gcc_test_task: STDFLAG: -std=c++2a version_script: make -C test showcxxversion # NOTE: -j$((`nproc`)): Container errored with 'OOMKilled' - build_script: make -C test -j12 + build_script: make -C test -j4 test_script: make -C test test #cirrus_use_gtest_task: @@ -24,8 +24,7 @@ cirrus_osx_14_test_task: &osx_task only_if: *default-condition auto_cancellation: true osx_instance: - image: mojave-xcode-10.1 - # image: high-sierra-xcode-9.4.1 + image: mojave-xcode env: STDFLAG: -std=c++14 version_script: make -C test showcxxversion From 6cff18ecf4598065aed521682413cb57e46ef125 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Wed, 4 Dec 2019 12:54:21 +0900 Subject: [PATCH 18/25] Update config.yml --- .circleci/config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9dff879b1..2cf7ae3ed8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,11 +17,6 @@ jobs: MAKE_RUN_TARGET: run_all_tests steps: - checkout - - run: - name: spec - command: | - nproc - free -m - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS - restore_cache: &restore_cache keys: From b52b9c96fd43b34cebe59b9f893b47d8464eeb51 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Fri, 6 Dec 2019 17:12:47 +0900 Subject: [PATCH 19/25] macos version specific --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index de87b75543..5b75b889a2 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,6 +35,7 @@ cirrus_osx_17_test_task: <<: *osx_task env: STDFLAG: -std=c++17 + CXXFLAGS: -mmacosx-version-min=10.15 # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header depends_on: - cirrus_osx_14_test From f7b1c5c9a60ff4e4837814e3b1039fa4c02fdfe3 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Sat, 7 Dec 2019 15:07:22 +0900 Subject: [PATCH 20/25] -lstdc++fs --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5b75b889a2..2e4b58f907 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,7 +35,7 @@ cirrus_osx_17_test_task: <<: *osx_task env: STDFLAG: -std=c++17 - CXXFLAGS: -mmacosx-version-min=10.15 # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header + CXXFLAGS: -mmacosx-version-min=10.15 -lstdc++fs # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header depends_on: - cirrus_osx_14_test From 4a9794f71124798b5ab9f9cf11467103cd1116fb Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 9 Dec 2019 09:52:05 +0900 Subject: [PATCH 21/25] LDFLAGS --- .cirrus.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2e4b58f907..300210f3c8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,7 +35,9 @@ cirrus_osx_17_test_task: <<: *osx_task env: STDFLAG: -std=c++17 - CXXFLAGS: -mmacosx-version-min=10.15 -lstdc++fs # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header + # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header + CXXFLAGS: -mmacosx-version-min=10.15 + LDFLAGS: -lstdc++fs depends_on: - cirrus_osx_14_test From 916b0bba719fedb5d3c203d32773ce5f4977170e Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 9 Dec 2019 10:15:13 +0900 Subject: [PATCH 22/25] -lstdc++ --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 300210f3c8..8727313742 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,7 +37,7 @@ cirrus_osx_17_test_task: STDFLAG: -std=c++17 # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header CXXFLAGS: -mmacosx-version-min=10.15 - LDFLAGS: -lstdc++fs + LDFLAGS: -lstdc++ depends_on: - cirrus_osx_14_test From d38315d3209f23f4907b518d1a39bf72a1853764 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Mon, 9 Dec 2019 12:45:10 +0900 Subject: [PATCH 23/25] -arch i386 --- .cirrus.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8727313742..f2a0fbd736 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,8 +36,7 @@ cirrus_osx_17_test_task: env: STDFLAG: -std=c++17 # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header - CXXFLAGS: -mmacosx-version-min=10.15 - LDFLAGS: -lstdc++ + CXXFLAGS: -mmacosx-version-min=10.15 -arch i386 depends_on: - cirrus_osx_14_test From a4229db12a6f350d472e0e91ec00f212712b5c95 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 10 Dec 2019 10:23:24 +0900 Subject: [PATCH 24/25] peakflow j4 --- peak_flow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peak_flow.yml b/peak_flow.yml index d4dab6e8c9..e824418b12 100644 --- a/peak_flow.yml +++ b/peak_flow.yml @@ -4,5 +4,5 @@ before_script: - gcc --version || true - clang --version || true script: - - make -C test -j$((`nproc`)) + - make -C test -j4 - make -C test test From 5d4d8f30525932b395bb6379a9213a10cdd4a007 Mon Sep 17 00:00:00 2001 From: srz_zumix Date: Tue, 10 Dec 2019 13:42:55 +0900 Subject: [PATCH 25/25] Update .cirrus.yml --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f2a0fbd736..db3572a0a8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -36,7 +36,7 @@ cirrus_osx_17_test_task: env: STDFLAG: -std=c++17 # https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header - CXXFLAGS: -mmacosx-version-min=10.15 -arch i386 + CXXFLAGS: -mmacosx-version-min=10.15 depends_on: - cirrus_osx_14_test