Skip to content

Commit 8e6b384

Browse files
committed
MINOR: Update TravisCI environment. Add Goreleaser configuration.
* Use 2.1.0 dataplane for testing, pull binaries with curl and adapt for Goreleaser-based dataplane releases. Use HAProxy 2.1 when testing. Make sure to have enough time (600s) when doing Go tests. * Add Goreleaser configuration that will build multiarch (386, amd64, arm and arm64) Linux builds. Add checksums and changelog to releases as well.
1 parent de98750 commit 8e6b384

File tree

3 files changed

+34
-16
lines changed

3 files changed

+34
-16
lines changed

.goreleaser.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
builds:
2+
- env:
3+
- CGO_ENABLED=0
4+
goos:
5+
- linux
6+
goarch:
7+
- 386
8+
- amd64
9+
- arm
10+
- arm64
11+
archives:
12+
- replacements:
13+
darwin: Darwin
14+
linux: Linux
15+
windows: Windows
16+
386: i386
17+
amd64: x86_64
18+
checksum:
19+
name_template: 'checksums.txt'
20+
snapshot:
21+
name_template: "{{ .Tag }}-next"
22+
changelog:
23+
sort: asc
24+
filters:
25+
exclude:
26+
- '^docs:'
27+
- '^test:'

.travis.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ go:
33
- 1.x
44
sudo: false
55
before_script:
6-
- sudo wget https://github.com/haproxytech/dataplaneapi/releases/download/v1.2.5/dataplaneapi -O /usr/local/bin/dataplaneapi
6+
- sudo curl -sfSL https://github.com/haproxytech/dataplaneapi/releases/download/v2.1.0/dataplaneapi_2.1.0_Linux_x86_64.tar.gz -o dataplane.tar.gz
7+
- sudo mkdir /tmp/dataplane
8+
- sudo tar -xzf dataplane.tar.gz -C /tmp/dataplane --strip-components=1
9+
- sudo mv /tmp/dataplane/dataplaneapi /usr/local/bin/dataplaneapi
710
- sudo chmod +x /usr/local/bin/dataplaneapi
811
- sudo apt-get install -y software-properties-common
9-
- sudo add-apt-repository -y ppa:vbernat/haproxy-2.0
12+
- sudo add-apt-repository -y ppa:vbernat/haproxy-2.1
1013
- sudo apt-get update
11-
- sudo apt-get install -y haproxy=2.0.\*
14+
- sudo apt-get install -y haproxy=2.1.\*
1215
- haproxy -vv
1316
script: make travis
1417
addons:
@@ -18,15 +21,3 @@ addons:
1821
- libssl-dev
1922
- zlib1g-dev
2023
- libpcre3-dev
21-
before_deploy:
22-
- echo "Deploying $TRAVIS_TAG to GitHub releases"
23-
- tar czf haproxy-connect.tar.gz haproxy-connect
24-
deploy:
25-
provider: releases
26-
api_key:
27-
secure: TcgCsEiX4V4mnkvogsYD1T9MtZETtugNk06rtRWxNxUChBmndyYk6fGE0dZRfZcBKY4Li9MsT3p9/Km8B36wBcu7w+t8hOC+qKZMfsXeFHtcOYETuRa1JhzUpeTisTgLd+JmYPUnffL7mxocWWCnenQkZW6+pLpYA3pE4JC7LmBr4UyuARC3u8zyXQ3q4FTUL2tzvA9BPRiZNDnIAapcA5h9cqMH0u7CwFbRnhGL6BbAav5SEALymlmQ48dqK2dhcbqgdxlxaf/9segEKJSEdSnUiHtlTKVCTd+o5gBF3qmF/EcpiO6Oy4RlGAqRtOsVl6x3/renRbJ3phys8ySYVb90/jsYAL2IsAuUDrW4lVLp7cwt7VckLhi2TzLjWOlZWg1MJti4sbfZ4b9EKGy3x2hnJz9xBSzDpi/VRWgIrmEOea2Agi4dVsBXppcB9AOsk9a/QK52AI3p5S+9wJteDVa6DuhY3vCK8Gm9Yir9evdOZpXXTd29J9uQxtlEqOHqFY0np3pu1yokpUVmKjIrgLHJ9dL0okLoPvcUpP2nrFFzzEYBe80TVCVo2mzek1nU0+NgVBpFzR54D/cN91lBcGMZLAiNALyqv49t4Wm5sm9dKHB0BnBxTY+MXWKsjq1ZvVABYrXTsB+p4xgNUhUGW9h1MW0d8I7W4ZC9F5JSktk=
28-
file: haproxy-connect.tar.gz
29-
skip_cleanup: true
30-
on:
31-
repo: criteo/haproxy-consul-connect
32-
tags: true

GNUmakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $(BIN): $(SOURCES)
99
bin: $(BIN)
1010

1111
test:
12-
go test -timeout 30s ${gobuild_args} ./...
12+
go test -timeout 600s ${gobuild_args} ./...
1313
check:
1414
go fmt ./...
1515
go vet ./...

0 commit comments

Comments
 (0)