From 9fe8adc56910c4b8d62115dc9f8641df78abfced Mon Sep 17 00:00:00 2001 From: Shubhit Singh Date: Fri, 20 Jan 2023 15:53:29 -0800 Subject: [PATCH] fix gitignore --- .dockerignore | 1 + .gitignore | 3 +-- make/go/base.mk | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 85603de4..88a29d95 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ .tmp/ .vscode/ cmd/lekko/lekko +dist/ diff --git a/.gitignore b/.gitignore index 1c169922..f3058996 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ /.tmp/ /.vscode/ /cmd/lekko/lekko - -dist/ +/dist/ diff --git a/make/go/base.mk b/make/go/base.mk index b15bb8ca..ef29814c 100644 --- a/make/go/base.mk +++ b/make/go/base.mk @@ -12,6 +12,8 @@ $(call _assert_var,GO_MODULE) UNAME_OS := $(shell uname -s) UNAME_ARCH := $(shell uname -m) +DIST_DIR := dist + ENV_DIR := .env ENV_SH := $(ENV_DIR)/env.sh ENV_BACKUP_DIR := $(HOME)/.config/$(PROJECT)/env @@ -20,7 +22,7 @@ TMP := .tmp # Settable # These are exact file paths that are added to .gitignore and .dockerignore -FILE_IGNORES := $(FILE_IGNORES) $(ENV_DIR)/ $(TMP)/ +FILE_IGNORES := $(FILE_IGNORES) $(ENV_DIR)/ $(TMP)/ $(DIST_DIR)/ # Settable # These will be added without any modification to .gitignore GIT_FILE_IGNORES ?=