Skip to content

Commit 35af32b

Browse files
committed
Update
1 parent 46c39ae commit 35af32b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ INSTALL_DIR = $(INSTALL) -m755 -d
1717
INSTALL_DATA = $(INSTALL) -m644
1818
INSTALL_PROGRAM = $(INSTALL) -m755
1919
GIT_REVISION = $(strip $(shell git rev-parse HEAD 2> /dev/null ))
20-
GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)"; git tag --points-at $$head 2> /dev/null | tail -1) )
20+
GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)"; git tag --points-at $$head 2> /dev/null | tail -1 | grep -v latest))
2121
SOURCE_DATE_EPOCH_PATH = lib/elixir/tmp/ebin_reproducible
2222
SOURCE_DATE_EPOCH_FILE = $(SOURCE_DATE_EPOCH_PATH)/SOURCE_DATE_EPOCH
2323

@@ -176,9 +176,7 @@ clean_elixir:
176176

177177
#==> Documentation tasks
178178

179-
SOURCE_REF = $(shell tag="$(call GIT_TAG)"; revision="$(call GIT_REVISION)"; \
180-
if echo "$$tag" | grep -Eq -- '-latest$$'; then tag=""; fi; \
181-
echo "$${tag:-$$revision}")
179+
SOURCE_REF = $(shell tag="$(call GIT_TAG)" revision="$(call GIT_REVISION)"; echo "$${tag:-$$revision}")
182180
DOCS_COMPILE = CANONICAL=$(CANONICAL) bin/elixir ../ex_doc/bin/ex_doc "$(1)" "$(VERSION)" "lib/$(2)/ebin" --main "$(3)" --source-url "https://github.com/elixir-lang/elixir" --source-ref "$(call SOURCE_REF)" --logo lib/elixir/pages/images/logo.png --output doc/$(2) --canonical "https://hexdocs.pm/$(2)/$(CANONICAL)" --homepage-url "https://elixir-lang.org/docs.html" $(4)
183181
DOCS_CONFIG = bin/elixir lib/elixir/scripts/docs_config.exs "$(1)"
184182

0 commit comments

Comments
 (0)