From fdf7820ad90c20a9d57945c2d62d6f2443b3af1f Mon Sep 17 00:00:00 2001
From: Ash McKenzie <amckenzie@gitlab.com>
Date: Wed, 2 Feb 2022 11:48:33 +1100
Subject: [PATCH 1/3] Alpha sort .gitignore

---
 .gitignore | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index dd6d63bc..a803436f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,20 @@
-config.yml
-cover.out
-tmp/*
-.idea
 *.log
 *.swp
-/*.log*
-authorized_keys.lock
-.gitlab_shell_secret
 .bundle
-tags
 .bundle/
-custom_hooks
-hooks/*.d
-/go_build
-/bin/gitlab-sshd
+.gitlab_shell_secret
+.idea
+/*.log*
+/bin/check
 /bin/gitlab-shell
 /bin/gitlab-shell-authorized-keys-check
 /bin/gitlab-shell-authorized-principals-check
-/bin/check
+/bin/gitlab-sshd
+/go_build
+authorized_keys.lock
+config.yml
+cover.out
+custom_hooks
+hooks/*.d
+tags
+tmp/*
-- 
GitLab


From 9e2372ca83907a87e00610d91a837c50d129c29d Mon Sep 17 00:00:00 2001
From: Ash McKenzie <amckenzie@gitlab.com>
Date: Wed, 2 Feb 2022 11:48:48 +1100
Subject: [PATCH 2/3] Ignore vendor directory

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a803436f..860519a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ custom_hooks
 hooks/*.d
 tags
 tmp/*
+vendor
-- 
GitLab


From 4c52728138b01bc037301c9260cee64692eddea7 Mon Sep 17 00:00:00 2001
From: Ash McKenzie <amckenzie@gitlab.com>
Date: Wed, 2 Feb 2022 12:00:33 +1100
Subject: [PATCH 3/3] Ignore vendor/ directory even if present

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ae83d7c0..55181714 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ GO_SOURCES := $(shell find . -name '*.go')
 VERSION_STRING := $(shell git describe --match v* 2>/dev/null || awk '$$0="v"$$0' VERSION 2>/dev/null || echo unknown)
 BUILD_TIME := $(shell date -u +%Y%m%d.%H%M%S)
 BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackdriver
-GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)"
+GOBUILD_FLAGS := -ldflags "-X main.Version=$(VERSION_STRING) -X main.BuildTime=$(BUILD_TIME)" -tags "$(BUILD_TAGS)" -mod=mod
 
 PREFIX ?= /usr/local
 
-- 
GitLab