From cf7a2d7a25481524979a45a0c7f697541ba82b61 Mon Sep 17 00:00:00 2001
From: Derek Parker <deparker@redhat.com>
Date: Mon, 8 Jul 2019 15:36:13 -0700
Subject: [PATCH] scripts: Prefer 'go mod vendor'

Remove dependancy on glide and instead switch completely over to using
`go mod vendor` as our vendor solution.
---
 glide.lock      | 46 ----------------------------------------------
 glide.yaml      | 37 -------------------------------------
 scripts/make.go |  3 +--
 3 files changed, 1 insertion(+), 85 deletions(-)
 delete mode 100644 glide.lock
 delete mode 100644 glide.yaml

diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index 55d5000d..00000000
--- a/glide.lock
+++ /dev/null
@@ -1,46 +0,0 @@
-hash: baaa9efd6720c470cdfecea8de054833ad0ff020f42efba7309fb81c8b56597a
-updated: 2018-06-14T11:38:05.009082242-07:00
-imports:
-- name: github.com/cosiner/argv
-  version: 13bacc38a0a5e0eba18b6f03cbb15dc5d4243b04
-- name: github.com/cpuguy83/go-md2man
-  version: 20f5889cbdc3c73dbd2862796665e7c465ade7d1
-  subpackages:
-  - md2man
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/mattn/go-colorable
-  version: ded68f7a9561c023e790de24279db7ebf473ea80
-- name: github.com/mattn/go-isatty
-  version: 0360b2af4f38e8d38c7fce2a9f4e702702d73a39
-- name: github.com/peterh/liner
-  version: 88609521dc4b6c858fd4c98b628147da928ce4ac
-- name: github.com/pkg/profile
-  version: 06b906832ed0e32302a942b63b6c5f8359034d26
-- name: github.com/russross/blackfriday
-  version: 11635eb403ff09dbc3a6b5a007ab5ab09151c229
-- name: github.com/sirupsen/logrus
-  version: ea8897e79973357ba785ac2533559a6297e83c44
-- name: github.com/spf13/cobra
-  version: b6cb3958937245a12d4d7728be080a6c758f4136
-  subpackages:
-  - doc
-- name: github.com/spf13/pflag
-  version: 9e4c21054fa135711121b557932b1887f2405d92
-- name: golang.org/x/arch
-  version: 077ac972c2e48fdb75168a5ba36a387f0c72d8aa
-  subpackages:
-  - x86/x86asm
-- name: golang.org/x/crypto
-  version: fd5f17ee729917fcb39f16421460212d917a0813
-  subpackages:
-  - ssh
-  - ssh/terminal
-- name: golang.org/x/sys
-  version: 8883426083c04a2627e6e59d84d5f6fb63d16c91
-  subpackages:
-  - unix
-  - windows
-- name: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-testImports: []
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index 6b38e526..00000000
--- a/glide.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-package: github.com/derekparker/delve
-import:
-- package: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- package: github.com/mattn/go-colorable
-  version: ded68f7a9561c023e790de24279db7ebf473ea80
-- package: github.com/mattn/go-isatty
-  version: ^0.0.2
-- package: github.com/peterh/liner
-  version: 88609521dc4b6c858fd4c98b628147da928ce4ac
-- package: github.com/pkg/profile
-  version: 06b906832ed0e32302a942b63b6c5f8359034d26
-- package: github.com/spf13/cobra
-  version: b6cb3958937245a12d4d7728be080a6c758f4136
-  subpackages:
-  - doc
-- package: github.com/spf13/pflag
-  version: 9e4c21054fa135711121b557932b1887f2405d92
-- package: golang.org/x/arch
-  version: 077ac972c2e48fdb75168a5ba36a387f0c72d8aa
-  subpackages:
-  - x86/x86asm
-- package: golang.org/x/sys
-  version: 8883426083c04a2627e6e59d84d5f6fb63d16c91
-  subpackages:
-  - unix
-  - windows
-- package: golang.org/x/crypto
-  version: fd5f17ee729917fcb39f16421460212d917a0813
-  subpackages:
-  - ssh
-- package: gopkg.in/yaml.v2
-  version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b
-- package: github.com/cpuguy83/go-md2man
-  version: v1.0.8
-  subpackages:
-  - md2man
diff --git a/scripts/make.go b/scripts/make.go
index 18839bf8..2920d678 100644
--- a/scripts/make.go
+++ b/scripts/make.go
@@ -97,8 +97,7 @@ This option can only be specified if testset is basic or a single package.`)
 		Use:   "vendor",
 		Short: "vendors dependencies",
 		Run: func(cmd *cobra.Command, args []string) {
-			execute("glide", "up", "-v")
-			execute("glide-vc", "--use-lock-file", "--no-tests", "--only-code")
+			execute("go", "mod", "vendor")
 		},
 	})
 
-- 
GitLab