Skip to content

Commit

Permalink
Merge 5d4d8f3 into fae3122
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Dec 10, 2019
2 parents fae3122 + 5d4d8f3 commit e1dea15
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 15 deletions.
1 change: 0 additions & 1 deletion .ci/azure_pipelines/template-make-test-steps.yml
Expand Up @@ -12,7 +12,6 @@ parameters:

steps:
- script: |
nproc
ulimit -c unlimited && ulimit -a
mkdir -p ~/.config/apport/
echo [main] > ~/.config/apport/settings
Expand Down
19 changes: 15 additions & 4 deletions .circleci/config.yml
Expand Up @@ -17,7 +17,6 @@ jobs:
MAKE_RUN_TARGET: run_all_tests
steps:
- checkout
- run: nproc
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
- restore_cache: &restore_cache
keys:
Expand Down Expand Up @@ -77,19 +76,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:
Expand Down Expand Up @@ -120,6 +131,6 @@ workflows:
only:
- master
- develop
#- /^feature.*/
- /^feature.*/
- /^fix.*/
- /^circleci.*/
16 changes: 10 additions & 6 deletions .cirrus.yml
Expand Up @@ -8,9 +8,10 @@ cirrus_gcc_test_task:
STDFLAG: -std=c++14
STDFLAG: -std=c++17
STDFLAG: -std=c++2a
spec_script: nproc
version_script: make -C test showcxxversion
test_script: cd test && make -j4 && make test
# NOTE: -j$((`nproc`)): Container errored with 'OOMKilled'
build_script: make -C test -j4
test_script: make -C test test

#cirrus_use_gtest_task:
# env:
Expand All @@ -23,17 +24,19 @@ 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
test_script: cd test && make -j4 && make test
build_script: make -C test -j$((`getconf _NPROCESSORS_ONLN`))
test_script : make -C test test

cirrus_osx_17_test_task:
<<: *osx_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
depends_on:
- cirrus_osx_14_test

Expand All @@ -52,5 +55,6 @@ 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
build_script: gmake -C test -j4
test_script : gmake -C test test

1 change: 0 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -17,7 +17,6 @@ jobs:
if: "! contains(github.event.head_commit.message, '[ci skip]')"
steps:
- run: |
nproc
echo "${{ github.event.head_commit.message }}"
llvm-basic-test:
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions peak_flow.yml
@@ -1,9 +1,8 @@
before_script:
- cat /proc/cpuinfo || true
- cat /proc/meminfo || true
- nproc
- gcc --version || true
- clang --version || true
script:
- make -C test -j$((`nproc`))
- make -C test -j4
- make -C test test

0 comments on commit e1dea15

Please sign in to comment.