From d9be86d69a5f6f2ed2c5a9c94f2637d9805fc735 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Sun, 28 Jun 2020 14:44:53 +0100 Subject: [PATCH] Remove Travis FreeBSD debug acces workaround (ENV_HACK) --- .travis.yml | 12 +++++------- ci/travis-env-hack.bash | 37 ------------------------------------- 2 files changed, 5 insertions(+), 44 deletions(-) delete mode 100755 ci/travis-env-hack.bash diff --git a/.travis.yml b/.travis.yml index ad391b3c8..1de130691 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ cache: env: global: - VERILATOR_ROOT=$TRAVIS_BUILD_DIR - # Hack around debug mode issues on FreeBSD - - ENV_HACK=$([ ! -e $TRAVIS_BUILD_DIR/ci/travis-env-hack.bash ] || $TRAVIS_BUILD_DIR/ci/travis-env-hack.bash) # The list and order of build stages stages: @@ -122,11 +120,11 @@ jobs: - {stage: test, if: type = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6}, git: {clone: false}, env: TESTS=dist-vlt-1} - {stage: test, if: type = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6}, git: {clone: false}, env: TESTS=vltmt-0} - {stage: test, if: type = cron, os: osx, osx_image: xcode11.6, compiler: clang, workspaces: {use: osx-xcode11.6}, git: {clone: false}, env: TESTS=vltmt-1} - # FreeBSD tests - Note these need the git clone in order to pick up the ENV_HACK - - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=dist-vlt-0} - - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=dist-vlt-1} - - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=vltmt-0} - - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: true}, env: TESTS=vltmt-1} + # FreeBSD tests + - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=dist-vlt-0} + - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=dist-vlt-1} + - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=vltmt-0} + - {stage: test, if: type = cron, os: freebsd, compiler: clang, workspaces: {use: freebsd}, git: {clone: false}, env: TESTS=vltmt-1} notifications: email: diff --git a/ci/travis-env-hack.bash b/ci/travis-env-hack.bash deleted file mode 100755 index 5a46bddd8..000000000 --- a/ci/travis-env-hack.bash +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash -# DESCRIPTION: Verilator: Travis CI early platform workaround -# -# Copyright 2020 by Geza Lore. This program is free software; you -# can redistribute it and/or modify it under the terms of either the GNU -# Lesser General Public License Version 3 or the Perl Artistic License -# Version 2.0. -# -# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0 - -################################################################################ -# This script runs very early by setting an env variable to $() -# This is to work around travis-ci issues -################################################################################ - -set -e -set -x - -if [ "$TRAVIS_OS_NAME" = "freebsd" ]; then - # Needs bash in bin for non-portable #! in scripts - sudo ln -s "$(which bash)" /bin/bash - # Needs tmate for debug mode (the one in pkg is too old, so build from source) - sudo pkg install -y libevent - sudo pkg install -y msgpack - sudo pkg install -y libssh - git clone https://github.com/tmate-io/tmate.git /tmp/tmate-build - pushd /tmp/tmate-build - git checkout 2.4.0 - ./autogen.sh - ./configure - make -j$(sysctl -n hw.ncpu) - sudo make install - popd - # Travis debug scripts also require this to be in /usr/bin rather than - # /usr/local/bin whre the abote puts it - sudo ln -s "$(which tmate)" /usr/bin/tmate -fi