Skip to content

Commit

Permalink
Fix misleading README install instructions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Claude Jones committed Jun 1, 2017
1 parent 8a3a952 commit f80cd77
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ endif
PROJECT := github.com/juju/juju
PROJECT_DIR := $(shell go list -e -f '{{.Dir}}' $(PROJECT))

ifeq ($(shell uname -p | sed -r 's/.*(86|armel|armhf|aarch64|ppc64le|s390x).*/golang/'), golang)
GO_C := golang-1.8
INSTALL_FLAGS :=
else
GO_C := gccgo-4.9 gccgo-go
INSTALL_FLAGS := -gccgoflags=-static-libgo
endif

# Allow the tests to take longer on arm platforms.
ifeq ($(shell uname -p | sed -r 's/.*(armel|armhf|aarch64).*/golang/'), golang)
TEST_TIMEOUT := 2400s
Expand All @@ -31,7 +23,6 @@ define DEPENDENCIES
distro-info-data
git
zip
$(GO_C)
endef

default: build
Expand Down Expand Up @@ -98,7 +89,6 @@ rebuild-dependencies.tsv: godeps
# PPA includes the required mongodb-server binaries.
install-dependencies:
@echo Adding juju PPAs for golang and juju
@sudo apt-add-repository --yes ppa:juju/golang
@sudo apt-add-repository --yes ppa:juju/stable
@sudo apt-get update
@echo Installing dependencies
Expand Down
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,23 @@ stable PPA, `https://launchpad.net/~juju/+archive/stable`, and can be installed
sudo apt-add-repository ppa:juju/stable
sudo apt-get update
sudo apt-get install juju

Getting Golang
--------------

`juju` currently depends on Go 1.8. One of the easiest ways to install golang is
from a snap. You may need to first install the [snap client](https://snapcraft.io/docs/core/install).
Installing the golang snap package is then as easy as

snap install go --classic

You can read about the "classic" confinement policy [here](https://insights.ubuntu.com/2017/01/09/how-to-snap-introducing-classic-confinement/)

If you want to use `apt`, then you can add the [juju-golang PPA](https://launchpad.net/~juju/+archive/ubuntu/golang) and then run the following

sudo apt install golang-1.8

Alternatively, you can always follow the official [binary installation instructions](https://golang.org/doc/install#install)

Setting GOPATH
--------------
Expand Down

0 comments on commit f80cd77

Please sign in to comment.