Merge pull request #965 from Yelp/u/emanelsabban/fix-make-release

Remove /docs/source/generated from gitignore file
Yelp · May 17, 2024 · 1ab1a53 · 1ab1a53
2 parents 677ebd7 + 24b5fed
commit 1ab1a53
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,6 @@ tron.egg-info
 *.swp
 *.swo
 docs/_build/
-docs/source/generated
 .idea
 .vscode
 tron.iml

diff --git a/Makefile b/Makefile
@@ -107,7 +107,7 @@ release:
 	dch -v $(RELEASE) --distribution jammy --changelog ./debian/changelog $$'$(VERSION) tagged with \'make release\'\rCommit: $(LAST_COMMIT_MSG)'
 	sed -i -e "s/__version__ = .*/__version__ = \"$(VERSION)\"/" ./tron/__init__.py
 	make docs || true
-	git add -f ./Makefile ./debian/changelog ./tron/__init__.py ./docs/source/generated/
+	git add ./Makefile ./debian/changelog ./tron/__init__.py ./docs/source/generated/
 	git commit -m "Released $(RELEASE) via make release"
 	if [[ "$$(git status --porcelain --untracked-files=all)" != "$$(<$(untracked_files_tmpfile))" ]]; then echo "Error: automatic git commit left some files uncommitted. Fix the git commit command in ./Makefile to include any automatically generated files that it is currently missing."; exit 1; fi
 	git tag v$(VERSION)
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ tron.egg-info @@
     *.swp
     *.swo
     docs/_build/
-    docs/source/generated
     .idea
     .vscode
     tron.iml
@@ Expand Down @@