Skip to content

Commit f7cb8c7

Browse files
Removed Glide files, references in readme and updated CI/CD
1 parent 29e6ee2 commit f7cb8c7

File tree

6 files changed

+16
-224
lines changed

6 files changed

+16
-224
lines changed

.circleci/config.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ version: 2 # use CircleCI 2.0
22
jobs:
33
build:
44
docker:
5-
- image: circleci/golang:1.12
5+
- image: circleci/golang:1.17
66
working_directory: /go/src/github.com/cloudfoundry-community/splunk-firehose-nozzle
77
steps: # steps that comprise the `build` job
88
- checkout # check out source code to working directory
99
- run:
1010
name: Install Dependencies
1111
command: |
12-
go get -u -v -t github.com/Masterminds/glide
13-
glide install --strip-vendor
12+
go mod vendor
1413
- run:
1514
name: Builder
1615
command: make build
@@ -26,7 +25,7 @@ jobs:
2625

2726
deploy-nozzle:
2827
docker:
29-
- image: circleci/golang:1.12
28+
- image: circleci/golang:1.17
3029
working_directory: /go/src/github.com/cloudfoundry-community/splunk-firehose-nozzle
3130
steps: # steps that comprise the `deploy` job
3231
- attach_workspace:
@@ -35,8 +34,7 @@ jobs:
3534
- run:
3635
name: Install dependencies
3736
command: |
38-
go get -u -v -t github.com/Masterminds/glide
39-
glide install --strip-vendor
37+
go mod vendor
4038
cp -R /tmp/splunk-firehose-nozzle .
4139
- run:
4240
name: Deploy nozzle
@@ -47,7 +45,7 @@ jobs:
4745
4846
tile-builder:
4947
docker:
50-
- image: circleci/golang:1.12
48+
- image: circleci/golang:1.17
5149
working_directory: /go/src/github.com/cloudfoundry-community/splunk-firehose-nozzle
5250
steps:
5351
- attach_workspace:
@@ -66,7 +64,7 @@ jobs:
6664
6765
execute_tests:
6866
docker:
69-
- image: circleci/golang:1.12
67+
- image: circleci/golang:1.17
7068
working_directory: /go/src/github.com/cloudfoundry-community/splunk-firehose-nozzle
7169
steps:
7270
- attach_workspace:
@@ -75,8 +73,7 @@ jobs:
7573
- run:
7674
name: Install dependencies
7775
command: |
78-
go get -u -v -t github.com/Masterminds/glide
79-
glide install --strip-vendor
76+
go mod vendor
8077
cp -R /tmp/splunk-firehose-nozzle .
8178
- run:
8279
name: Deploy data-gen

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ endif
1212
default: installdeps build
1313

1414
installdeps:
15-
glide install --strip-vendor
15+
go mod vendor
1616

1717
updatedeps:
18-
glide update
18+
go get -u
19+
go mod tidy
20+
go mod vendor
1921

2022
initdeps:
21-
glide create
23+
go mod init
24+
go mod tidy
25+
go mod vendor
2226

2327
# -gcflags '-N -l' for debug
2428
# -ldflags -w for prod

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,10 +398,9 @@ Make sure you have the following installed on your workstation:
398398
399399
| Software | Version
400400
| --- | --- |
401-
| go | go1.12.x
402-
| glide | 0.12.x
401+
| go | go1.17.x
403402
404-
Then install all dependent packages via [Glide](https://glide.sh/):
403+
Then make sure that all dependent packages are there:
405404
406405
```
407406
$ cd <REPO_ROOT_DIRECTORY>

glide.lock

Lines changed: 0 additions & 123 deletions
This file was deleted.

glide.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

utils/glide.lock

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)