Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Go 1.10 #34

Merged
merged 2 commits into from
Aug 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ services:

language: go
go:
- '1.6'
- '1.10'
before_install:
- curl -L -o /tmp/dep-linux-amd64 https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && install -m 0755 /tmp/dep-linux-amd64 $GOPATH/bin/dep
Expand All @@ -25,7 +24,7 @@ deploy:
skip_cleanup: true
on:
tags: true
go: '1.6'
go: '1.10'
provider: releases
api_key:
secure: "ChMW+s/WvS+qdYhGdZoom5QqtFMjAXu1oHW/KyGcbUX1GBmf+mXk2Av22wr7lLWtZKzh6gpgfiPHxGNvQuctnZncGchSDqIbS2FyW+33vha4drWs8Z6RgWPcYYvYcDEO5rj+UDGgc+ARVCQtpLUMmOSfOhkLq574Cu2O0MFw/yfD5046pVsynTt3kgdWQnTxP78juw0LePafNswjTMXuoIGt5B46mrKCsVdxDh3ufP5dfuthe987QgXr6WkMFf6Chv/K/65Al89hsULgmqtDRtqmeMebLxOEXMYg7w54N3NDWe9baAlNQm57w5zSsvEnji3gWfub/5i6PMMDaixSCdUv5luYYGFDv4JuarfVuws5sYy5+2cGSxLE75u67akRRjU5ILgKEokA1yk9Soarzv1cQxefsOxH/KaW/gormu/pVX2hsdCLjA3cv8QFBIiqt6mcXLcD5LCBM+SrVslAOUBspmy7lsEC0HiHrHnVDhdszE1FPQLRL5GyGr3cxcBBXRLoh5jrt+dPRYgtdPVkDjJp0sEIC9ICYYuJorBNpgv6coTzqFXW7j1ItjniCxrJTwp8K4p3nI/t0QCFZO7SqR3BD9m//jvBu+QjBtNPs9re+ZUetI2HJsoYjLYlyLzYt+J9Hs94g469MFzDrd+qAEB6caEZLkRfNzMnqS0mVP4="
Expand Down
8 changes: 0 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@
branch = "master"
name = "golang.org/x/net"

# golang.org/x/sys/unix is broken on Go 1.6 as of https://github.com/golang/sys/commit/e072cadbbdc8dd3d3ffa82b8b4b9304c261d9311
#
# https://github.com/qmsk/e2/issues/33
# https://github.com/golang/go/issues/26576
[[override]]
name = "golang.org/x/sys"
revision = "ac767d655b"

[prune]
go-tests = true
unused-packages = true
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ Release binaries are built using the Docker-based setup under [build](/build)

go get github.com/qmsk/e2/cmd/...

Building the backend code requires at least [Go version 1.4](https://golang.org/dl/). Earlier versions lack support for:

* `atomic.Value` (added in Go 1.4)
Building the backend code requires [Go version 1.10](https://golang.org/dl/).

The Go binaries can also be cross-compiled for different platforms, such as building Linux ARM binaries on your laptop for use on a RaspberryPI:

Expand Down
6 changes: 3 additions & 3 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:xenial
FROM ubuntu:bionic

RUN apt-get update && apt-get install -y \
git curl \
git curl rsync \
golang-go \
nodejs nodejs-legacy npm
nodejs npm

RUN curl -L -o /tmp/dep-linux-amd64 https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && install -m 0755 /tmp/dep-linux-amd64 /usr/local/bin/dep
RUN npm install -g bower
Expand Down
4 changes: 2 additions & 2 deletions build/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ if [ -z "${SRC:-}" ]; then

[ -d $SRC ] || go get -v -d github.com/qmsk/e2/...
else
mkdir -p $GOPATH/src/github.com/qmsk
cp -ar $SRC $GOPATH/src/github.com/qmsk/e2
mkdir -p $GOPATH/src/github.com/qmsk/e2
rsync -rlpt $SRC/ $GOPATH/src/github.com/qmsk/e2/
fi

if [ -n "${GIT_TAG:-}" ]; then
Expand Down