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

dep => go mod #1062

Merged
merged 47 commits into from
Sep 30, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
074687e
go mod files added. dep removed
joe-elliott Sep 25, 2019
8dea03a
Magically got prometheus version to stick
joe-elliott Sep 25, 2019
3b7ba8c
Cortex updated and prometheus updated
joe-elliott Sep 25, 2019
c32e928
Updated prometheus dependency
joe-elliott Sep 25, 2019
75fc14f
Added additional deps
joe-elliott Sep 25, 2019
998d043
Added two replaces from Gopkg.toml. Tests passing
joe-elliott Sep 25, 2019
7ba77d6
Added deps
joe-elliott Sep 25, 2019
8848b5d
Updated build image to 1.12
joe-elliott Sep 25, 2019
3eba7b1
Updated golangci-lint to use vendored dependencies
joe-elliott Sep 25, 2019
61a62d6
Added check-mod makefile step and referenced in drone and circle ci c…
joe-elliott Sep 25, 2019
bf5d762
Updated loki-build-image to 1.12
joe-elliott Sep 25, 2019
6d33540
Fixed linting error. Force go111module on for linting
joe-elliott Sep 26, 2019
4427bf6
go mod vendor
joe-elliott Sep 26, 2019
3fba173
Forced the inclusion of modtimevfs
joe-elliott Sep 26, 2019
0aaaac4
Pin client-go due to issue with v12 go.mod
joe-elliott Sep 26, 2019
047058d
go mod tidy
joe-elliott Sep 26, 2019
d94c324
Added check-mod to drone
joe-elliott Sep 26, 2019
ea9a27f
Re-readded correct golang client
joe-elliott Sep 26, 2019
c8a74af
go mod tidy
joe-elliott Sep 26, 2019
c1e022a
Pinned golang/x/net to avoid proxy errors
joe-elliott Sep 26, 2019
bc2e826
Removed check-mod from all. Not necessary for tests
joe-elliott Sep 26, 2019
f58a567
Updated go.sum to match new pin
joe-elliott Sep 26, 2019
a7abe3a
Upgraded proto to match build image
joe-elliott Sep 26, 2019
c267897
Force check-mod to wait til after test and lint are successful
joe-elliott Sep 26, 2019
0b02ac3
Added mod vendor to go builds to force usage of vendored dependencies
joe-elliott Sep 26, 2019
6e5cc9e
Turn on gomodules on all builds
joe-elliott Sep 26, 2019
f63eb45
Revert "Added mod vendor to go builds to force usage of vendored depe…
joe-elliott Sep 26, 2019
95b168a
Moved builds out of the gopath to enforce vendor usage
joe-elliott Sep 26, 2019
1547c5d
Revert "Turn on gomodules on all builds"
joe-elliott Sep 26, 2019
b227f44
Explicitly choose build image for docker driver
joe-elliott Sep 26, 2019
b42c61c
Updated golang.org/x/sys to match prometheus's version to fix promtai…
joe-elliott Sep 26, 2019
53663e6
Added fluentbit dependency
joe-elliott Sep 27, 2019
a535c30
Added dependency management clause
joe-elliott Sep 27, 2019
942939e
Updated go version in contributing
joe-elliott Sep 27, 2019
6096862
Added phony makefile targets
joe-elliott Sep 27, 2019
5a9d2b0
Circle CI is increasingly failing linting
joe-elliott Sep 27, 2019
414e075
Force vendored deps on builds
joe-elliott Sep 27, 2019
44ddd0c
Added logcli to gitignore
joe-elliott Sep 27, 2019
4ec1755
Reduced concurrency to help CircleCI
joe-elliott Sep 27, 2019
63acf85
Moved drone builds out of GOPATH to force use of go module
joe-elliott Sep 27, 2019
07143c5
Added mod vendor to prevent go clean from redownloading all packages
joe-elliott Sep 27, 2019
0d97e84
Added to test as well
joe-elliott Sep 27, 2019
c7a800c
Added mod-vendor to final go commands
joe-elliott Sep 27, 2019
70c45d8
Moved fluent-bit out of GO_PATH to force go modules
joe-elliott Sep 27, 2019
3490373
Pass mod vendor to the last holdout: go generate
joe-elliott Sep 27, 2019
70a5e03
Updated ugorji/go to 1.17 to avoid version regression
joe-elliott Sep 27, 2019
ed2db69
go mod tidy and go mod vendor for ugorji/go
joe-elliott Sep 27, 2019
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
Prev Previous commit
Next Next commit
Force check-mod to wait til after test and lint are successful
Signed-off-by: Joe Elliott <number101010@gmail.com>
  • Loading branch information
joe-elliott committed Sep 27, 2019
commit c267897b2de4336f39cfa411cff40f585574fa1c
2 changes: 1 addition & 1 deletion .drone/drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ local drone = [
make('test', container=false) { depends_on: ['clone'] },
make('lint', container=false) { depends_on: ['clone'] },
make('check-generated-files', container=false) { depends_on: ['clone'] },
make('check-mod', container=false) { depends_on: ['clone'] },
make('check-mod', container=false) { depends_on: ['clone', 'test', 'lint'] },
],
},
] + [
Expand Down
2 changes: 2 additions & 0 deletions .drone/drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ steps:
- make BUILD_IN_CONTAINER=false check-mod
depends_on:
- clone
- test
- lint
image: grafana/loki-build-image:0.6.0
name: check-mod
workspace:
Expand Down