Skip to content

Commit 780049e

Browse files
committed
fix(travis): Fix release build errors and warnings
1 parent c922f4b commit 780049e

File tree

2 files changed

+4
-16
lines changed

2 files changed

+4
-16
lines changed

.travis.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: python
22
python: "3.7"
3+
os: linux
34

45
cache:
56
directories:
@@ -23,7 +24,7 @@ install: skip
2324
before_cache:
2425
- make clean-target-dir
2526

26-
matrix:
27+
jobs:
2728
fast_finish: true
2829
include:
2930
# -------------------------------------
@@ -41,14 +42,13 @@ matrix:
4142
# -------------------------------------
4243

4344
- name: "test: relay[linux]"
44-
os: linux
4545
addons:
4646
apt:
4747
packages:
4848
- libssl-dev
4949
- libgeoip-dev
5050
services:
51-
- redis-server
51+
- redis
5252
script: make -e test-rust-all
5353

5454
- name: "test: relay[macos]"
@@ -66,22 +66,17 @@ matrix:
6666
# -------------------------------------
6767

6868
- name: "test: librelay"
69-
os: linux
7069
script: make -e test-python
7170

7271
- name: "test: librelay[py2]"
7372
python: "2.7"
74-
os: linux
7573
script: make -e RELAY_PYTHON_VERSION=python2 test-python
7674

7775
# -------------------------------------
7876
# EXECUTALE INTEGRATION TESTS
7977
# -------------------------------------
8078

8179
- name: "integration-test: relay"
82-
os: linux
83-
# https://github.com/travis-ci/travis-ci/issues/9831
84-
sudo: true
8580
env:
8681
- KAFKA_BOOTSTRAP_SERVER="localhost:9092"
8782
install:
@@ -104,7 +99,6 @@ matrix:
10499

105100
- name: "release: relay[linux]"
106101
if: branch ~= /^release\/[\d.]+$/
107-
os: linux
108102
language: generic
109103
before_install: skip
110104
services:
@@ -135,8 +129,6 @@ matrix:
135129

136130
- name: "release: librelay[linux-x86]"
137131
if: branch ~= /^release\/[\d.]+$/
138-
os: linux
139-
sudo: required
140132
env: BUILD_ARCH=i686
141133
language: generic
142134
script:
@@ -146,7 +138,6 @@ matrix:
146138

147139
- name: "release: librelay[linux-x86_64]"
148140
if: branch ~= /^release\/[\d.]+$/
149-
sudo: required
150141
env: BUILD_ARCH=x86_64
151142
language: generic
152143
script:
@@ -167,9 +158,6 @@ matrix:
167158

168159
- name: "release: librelay[sdist]"
169160
if: branch ~= /^release\/[\d.]+$/
170-
os: linux
171-
sudo: required
172-
language: generic
173161
script:
174162
- make -e sdist
175163
- npm install -g @zeus-ci/cli || [[ ! "$TRAVIS_BRANCH" =~ ^release/ ]]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test-integration: build setup-geoip setup-venv
7272
.venv/bin/pytest tests -n12 --reruns 5 -v
7373
.PHONY: test-integration
7474

75-
test-process-event: setup-geoip
75+
test-process-event:
7676
# Process a basic event and assert its output
7777
bash -c 'diff \
7878
<(cargo run ${CARGO_ARGS} -- process-event <tests/fixtures/basic-event-input.json) \

0 commit comments

Comments
 (0)