diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2017-11-29 21:12:01 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2018-03-13 15:12:14 +0000 |
commit | 88c4ad5ce7db3df4dbae56b500ff9f6983dd0c3c (patch) | |
tree | 646c36a7c50f536a7a1c7fe16988873d9052ab8d | |
parent | 595fd1a2b226063b044de4ecfb17f7463cdfbe70 (diff) | |
download | strace-ldv/ci-musl-mainline-only.tar.gz |
ci: check fresh musl and mainline kernel headersldv/ci-musl-mainline-only
-rw-r--r-- | .gitlab-ci.yml | 24 | ||||
-rw-r--r-- | .travis.yml | 29 |
2 files changed, 7 insertions, 46 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ac054a7f..d690c9099 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,30 +8,18 @@ variables: SLEEP_A_BIT: "sleep 0.2" VERBOSE: "1" -gcc-x86_64: +musl-x86_64: stage: test script: ci/run-build-and-tests.sh variables: - CC: "gcc" + CC: "musl-gcc" TARGET: "x86_64" + KHEADERS: "torvalds/linux" -gcc-x86: +musl-x86: stage: test script: ci/run-build-and-tests.sh variables: - CC: "gcc" - TARGET: "x86" - -clang-x86_64: - stage: test - script: ci/run-build-and-tests.sh - variables: - CC: "clang" - TARGET: "x86_64" - -clang-x86: - stage: test - script: ci/run-build-and-tests.sh - variables: - CC: "clang" + CC: "musl-gcc" TARGET: "x86" + KHEADERS: "torvalds/linux" diff --git a/.travis.yml b/.travis.yml index 42d897c92..e8e05eb6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,38 +18,11 @@ env: matrix: include: - - compiler: gcc - env: - - TARGET=x86_64 - - compiler: gcc - env: - - TARGET=x32 - - compiler: gcc - env: - - TARGET=x86 - - compiler: clang - env: - - TARGET=x86_64 - compiler: musl-gcc env: - TARGET=x86_64 - - compiler: clang - env: - - TARGET=x86 + - KHEADERS=torvalds/linux - compiler: musl-gcc env: - TARGET=x86 - - compiler: gcc-7 - env: - - TARGET=x86_64 - - compiler: gcc-7 - env: - - TARGET=x32 - - compiler: gcc-7 - env: - - TARGET=x86 - - compiler: gcc - env: - - TARGET=x86_64 - - CHECK=coverage - KHEADERS=torvalds/linux |