From b8e1dbb060eb5d86cc51d0660e79ff2d6df75f94 Mon Sep 17 00:00:00 2001 From: Kreyren Date: Sun, 9 Feb 2020 17:24:40 +0000 Subject: [PATCH] fgkfhg --- .travis.yml | 95 ++++++++++++++++------------------- QA/travis-ci/install.sh | 2 +- QA/travis-ci/travis-common.sh | 2 +- 3 files changed, 46 insertions(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index eecd0b6..617e854 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,71 +34,64 @@ matrix: # TOOL="compile" # COMPILER_C="clang" # COMPILER_CXX="clang++" - - # Ubuntu Linux - # Ubuntu 19.10 (Eoan Ermine) with GCC - - name: "Ubuntu 19.10 (Eoan Ermine) with GCC" + # + # # Ubuntu Linux + # # Ubuntu 19.10 (Eoan Ermine) with GCC + # - name: "Ubuntu 19.10 (Eoan Ermine) with GCC" + # os: linux + # cache: + # directories: + # - /var/cache/apt/ + # dist: bionic + # group: travis_latest + # env: + # DOCKER="ubuntu:eoan" + # VARIANT="ubuntu-19.10" + # TOOL="compile" + # COMPILER_C="gcc" + # COMPILER_CXX="g++" + # REPOSITORY="https://github.com/RXT0112/Zernit.git" + # PACKAGES="git " + # # Ubuntu 19.10 (Eoan Ermine) with Clang + # - name: "Ubuntu 19.10 (Eoan Ermine) with Clang" + # os: linux + # cache: + # directories: + # - /var/cache/apt/ + # dist: bionic + # group: travis_latest + # env: + # DOCKER="ubuntu:eoan" + # VARIANT="ubuntu-19.10" + # TOOL="compile" + # COMPILER_C="clang" + # COMPILER_CXX="clang++" + # REPOSITORY="https://github.com/RXT0112/Zernit.git" + # PACKAGES="git" + # Debian Linux + # Debian Testing + - name: "Debian Testing with GCC" os: linux - cache: - directories: - - /var/cache/apt/ dist: bionic group: travis_latest env: - DOCKER="ubuntu:eoan" - VARIANT="ubuntu-19.10" + DOCKER="debian:testing" + VARIANT="debian" TOOL="compile" COMPILER_C="gcc" COMPILER_CXX="g++" REPOSITORY="https://github.com/RXT0112/Zernit.git" - PACKAGES="git" - # Ubuntu 19.10 (Eoan Ermine) with Clang - - name: "Ubuntu 19.10 (Eoan Ermine) with Clang" + - name: "Debian Testing with Clang" os: linux - cache: - directories: - - /var/cache/apt/ dist: bionic group: travis_latest env: - DOCKER="ubuntu:eoan" - VARIANT="ubuntu-19.10" + DOCKER="debian:testing" + VARIANT="debian" TOOL="compile" COMPILER_C="clang" COMPILER_CXX="clang++" REPOSITORY="https://github.com/RXT0112/Zernit.git" - PACKAGES="git" - # # Debian Linux - # # Debian Testing - # - name: "Debian Testing with GCC" - # os: linux - # dist: bionic - # group: travis_latest - # env: - # DOCKER="debian:testing" - # VARIANT="debian" - # TOOL="compile" - # COMPILER_C="gcc" - # COMPILER_CXX="g++" - - # - name: "Debian Testing with Clang" - # os: linux - # dist: bionic - # group: travis_latest - # env: - # DOCKER="debian:testing" - # VARIANT="debian" - # TOOL="compile" - # COMPILER_C="clang" - # COMPILER_CXX="clang++" - # # - name: "Debian Testing packaging with pbuilder" - # # os: linux - # # dist: bionic - # # group: travis_latest - # # env: - # # DOCKER="debian:testing" - # # VARIANT="debian" - # # TOOL="pbuilder" # # Debian Sid # - name: "Debian Sid with GCC" @@ -225,6 +218,6 @@ install: - QA/travis-ci/install.sh script: - - make build + - make build-rustlang # We already have logic for linting so there is no need to use 'make check' - - QA/tests/HELL/hell.sh \ No newline at end of file + #- QA/tests/HELL/hell.sh \ No newline at end of file diff --git a/QA/travis-ci/install.sh b/QA/travis-ci/install.sh index ba8f6b5..2c4aeae 100755 --- a/QA/travis-ci/install.sh +++ b/QA/travis-ci/install.sh @@ -48,7 +48,7 @@ elif [ "$TRAVIS_OS_NAME" = linux ] && [ -n "$DOCKER" ] && [ -z "$QEMU" ]; then fixme "Fix duplicates of repository update" case "$VARIANT" in - ubuntu-19.10) + ubuntu-*|debian-*) # Update repositories docker exec "$CONTAINER" apt update || die 1 "Unable to update repositories on '$VARIANT' using DOCKER '$DOCKER'" diff --git a/QA/travis-ci/travis-common.sh b/QA/travis-ci/travis-common.sh index 0928141..b4fd34b 100755 --- a/QA/travis-ci/travis-common.sh +++ b/QA/travis-ci/travis-common.sh @@ -6,7 +6,7 @@ die() { } # Simplified QA handling fixme() { - printf 'FIXME: %s/n' "$1" + printf 'FIXME: %s\n' "$1" } # Simplified info messages info() {