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

Update goproxy to default proxy.golang.org #743

Merged
merged 2 commits into from
Nov 13, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
env:
- GO111MODULE=on
- GOPROXY="https://gocenter.io"
- GOPROXY="https://proxy.golang.org,direct"

archives:
- id: default
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
language: go

go:
- "1.12.x"
- "1.13.x"
sudo: false

before_install:
# Make sure travis builds work for forks
- mkdir -p $TRAVIS_BUILD_DIR $GOPATH/src/github.com/wtfutil
- test ! -d $GOPATH/src/github.com/wtfutil/wtf && mv $TRAVIS_BUILD_DIR $GOPATH/src/github.com/wtfutil/wtf || true
- export TRAVIS_BUILD_DIR=$HOME/gopath/src/github.com/wtfutil/wtf
- cd $HOME/gopath/src/github.com/wtfutil/wtf
- export GOPROXY="https://gocenter.io" && export GO111MODULE=on
- export GOPROXY="https://proxy.golang.org,direct"

script: go get ./... && ./scripts/check-uncommitted-vendor-files.sh && go test -v github.com/wtfutil/wtf/...
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add --no-cache make ncurses

COPY . $GOPATH/src/github.com/wtfutil/wtf

ENV GOPROXY=https://gocenter.io
ENV GOPROXY=https://proxy.golang.org,direct
ENV GO111MODULE=on
ENV GOSUMDB=off

Expand All @@ -14,4 +14,4 @@ ENV PATH=$PATH:./bin

RUN make build

ENTRYPOINT "wtfutil"
ENTRYPOINT "wtfutil"
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ endif

# Set go modules to on and use GoCenter for immutable modules
export GO111MODULE = on
export GOPROXY = https://gocenter.io
export GOPROXY = https://proxy.golang.org,direct

# Determines the path to this Makefile
THIS_FILE := $(lastword $(MAKEFILE_LIST))
Expand Down Expand Up @@ -59,4 +59,4 @@ test: build
go test ./...

uninstall:
@rm ~/go/bin/wtfutil
@rm ~/go/bin/wtfutil
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ and you should be good to go.
If you want to run the build command from within your `$GOPATH`:

```bash
# Set the Go proxy variable to GoCenter
export GOPROXY="https://gocenter.io"
# Set the Go proxy
export GOPROXY="https://proxy.golang.org,direct"

# Disable the Go checksum database
export GOSUMDB=off
Expand All @@ -111,8 +111,8 @@ make run
If you want to run the build command from a folder that is not in your `$GOPATH`:

```bash
# Set the Go proxy variable to GoCenter
export GOPROXY="https://gocenter.io"
# Set the Go proxy
export GOPROXY="https://proxy.golang.org,direct"

go get -u github.com/wtfutil/wtf
cd $GOPATH/src/github.com/wtfutil/wtf
Expand Down Expand Up @@ -147,7 +147,7 @@ Find #wtfutil on https://gophers.slack.com/ and join us.

### Twitter

Also, follow [on Twitter](https://twitter.com/wtfutil) for news and latest updates.
Also, follow [on Twitter](https://twitter.com/wtfutil) for news and latest updates.

## Documentation

Expand Down Expand Up @@ -182,7 +182,7 @@ If there is a bug that you really need to have fixed or a feature you really wan

## Contributing to the Source Code

First, please read [Talk, then code](https://dave.cheney.net/2019/02/18/talk-then-code) by Dave Cheney. It's great advice and will often save a lot of time and effort.
First, please read [Talk, then code](https://dave.cheney.net/2019/02/18/talk-then-code) by Dave Cheney. It's great advice and will often save a lot of time and effort.

Next, please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests.

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/wtfutil/wtf

go 1.12
go 1.13

require (
code.cloudfoundry.org/bytefmt v0.0.0-20190819182555-854d396b647c
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-uncommitted-vendor-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

GOPROXY="https://gocenter.io" GOSUMDB=off GO111MODULE=on go mod tidy
GOPROXY="https://proxy.golang.org,direct" GOSUMDB=off GO111MODULE=on go mod tidy

untracked_files=$(git ls-files --others --exclude-standard | wc -l)

Expand Down