Skip to content

Commit

Permalink
Merge pull request #1808 from transcom/roc-upgrade-go-1.12
Browse files Browse the repository at this point in the history
Upgrade Go to version 1.12
  • Loading branch information
Ronolibert committed Mar 1, 2019
2 parents f6d1f63 + 907125e commit 38462bd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ executors:
resource_class: small
working_directory: ~/go/src/github.com/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:d1a2b3b5c3b196e91eb1c30926953d0665ec3fd1
- image: trussworks/circleci-docker-primary:a1006bfda60d05876196f03119898777542529d5
mymove_medium:
resource_class: medium
working_directory: ~/go/src/github.com/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:d1a2b3b5c3b196e91eb1c30926953d0665ec3fd1
- image: trussworks/circleci-docker-primary:a1006bfda60d05876196f03119898777542529d5
mymove_large:
resource_class: large
working_directory: ~/go/src/github.com/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:d1a2b3b5c3b196e91eb1c30926953d0665ec3fd1
- image: trussworks/circleci-docker-primary:a1006bfda60d05876196f03119898777542529d5
# `mymove_and_postgres_medium` adds a secondary postgres container to be used during testing.
mymove_and_postgres_medium:
resource_class: medium
working_directory: ~/go/src/github.com/transcom/mymove
docker:
- image: trussworks/circleci-docker-primary:d1a2b3b5c3b196e91eb1c30926953d0665ec3fd1
- image: trussworks/circleci-docker-primary:a1006bfda60d05876196f03119898777542529d5
- image: postgres:10.5
environment:
- POSTGRES_PASSWORD: mysecretpassword
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ repos:
- repo: git://github.com/dnephin/pre-commit-golang
rev: v0.3.2
hooks:
- id: go-vet
# - id: go-vet uncomment when go@1.12 is supported for this hook
- id: go-lint

- repo: local
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ The following commands will get mymove running on your machine for the first tim
* Install it with Homebrew: `brew install go`
* Pin it, so that you don't accidentally upgrade before we upgrade the project: `brew pin go`
* When we upgrade the project's go version, unpin, upgrade, and then re-pin: `brew unpin go; brew upgrade go; brew pin go`
* **Note**: If you have previously modified your PATH to point to a specific version of go, make sure to remove that. This would be either in your `.bash_profile` or `.bashrc`, and might look something like `PATH=$PATH:/usr/local/opt/go@1.11.4/bin`.
* **Note**: If you have previously modified your PATH to point to a specific version of go, make sure to remove that. This would be either in your `.bash_profile` or `.bashrc`, and might look something like `PATH=$PATH:/usr/local/opt/go@1.12/bin`.
* Ensure you are using the latest version of bash for this project:
* Install it with Homebrew: `brew install bash`
* Update list of shells that users can choose from: `[[ $(cat /etc/shells | grep /usr/local/bin/bash) ]] || echo "/usr/local/bin/bash" | sudo tee -a /etc/shells`
Expand Down
2 changes: 1 addition & 1 deletion bin/check_go_version
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu -o pipefail

VERSION="go1.11.5"
VERSION="go1.12"

if [[ $(go version) = *$VERSION* ]]; then
echo "$VERSION installed"
Expand Down

0 comments on commit 38462bd

Please sign in to comment.