From 5774066ddb5cafa01ce29b82aa437af01ac1007a Mon Sep 17 00:00:00 2001 From: chainhelen Date: Mon, 16 Mar 2020 11:37:33 -0500 Subject: [PATCH] *: Transfer 32-bit test into travis from cirrus (#1932) --- .cirrus.yml | 31 ++++++------------------------- .travis.yml | 27 ++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d7d0cfb3..a5727d0f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,28 +1,9 @@ -freebsd_task: - env: - GOFLAGS: -mod=vendor - - freebsd_instance: - image: freebsd-11-2-release-amd64 +env: + GOFLAGS: -mod=vendor +freebsd_instance: + image: freebsd-11-2-release-amd64 + +test_task: install_script: pkg install -y go gcc git test_script: make test - -linux386_task: - container: - image: i386/ubuntu:18.04 - env: - matrix: - - GOVERSION: 1.12 - - GOVERSION: 1.13 - - GOVERSION: 1.14 - test_script: - - apt-get -y update - - apt-get -y install software-properties-common - - apt-get -y install git - - add-apt-repository ppa:longsleep/golang-backports - - apt-get -y install golang-${GOVERSION}-go - - export PATH=$PATH:/usr/lib/go-${GOVERSION}/bin - - go version - - uname -a - - make test diff --git a/.travis.yml b/.travis.yml index 13b96bfe..8ba82dbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ arch: - arm64 go: - - tip - 1.14.x - 1.13.x - 1.12.x + - tip matrix: allow_failures: @@ -41,6 +41,31 @@ before_install: - export GOFLAGS=-mod=vendor - if [ $TRAVIS_OS_NAME = "linux" ]; then sudo apt-get -qq update; sudo apt-get install -y dwz; echo "dwz version $(dwz --version)"; fi - if [ $TRAVIS_OS_NAME = "windows" ]; then choco install procdump make; fi + + +# 386 linux +jobs: + include: + - os: linux + services: docker + env: go_32_version=1.14 + +script: >- + if [ $TRAVIS_OS_NAME = "linux" ] && [ $go_32_version ]; then + docker pull i386/centos:7; + docker run -v $(pwd):/delve --privileged i386/centos:7 /bin/bash -c "set -x && \ + cd delve && \ + yum -y update && yum -y upgrade && \ + yum -y install wget make git gcc && \ + wget -q https://dl.google.com/go/go${go_32_version}.linux-386.tar.gz && \ + tar -C /usr/local -xzf go${go_32_version}.linux-386.tar.gz && \ + export PATH=$PATH:/usr/local/go/bin && \ + go version && \ + uname -a && \ + make test"; + else + make test; + fi cache: directories: