Merge branch 'maint'

kianmeng · Oct 8, 2021 · 0e414e3 · 0e414e3
2 parents 818bfab + d306788
commit 0e414e3
Show file tree

Hide file tree

Showing 10 changed files with 696 additions and 406 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -234,8 +234,10 @@ jobs:
           TAG=${GITHUB_REF#refs/tags/}
           IS_RELEASE=`$(echo $TAG | grep -E '^OTP-[0-9]+\.[0-9]+$' > /dev/null) \
             && echo "true" || echo "false"`
+          VSN=${TAG#OTP-}
           echo "::set-output name=tag::${TAG}"
           echo "::set-output name=release::${IS_RELEASE}"
+          echo "::set-output name=vsn::${VSN}"
       
       - uses: actions/checkout@v2
 

diff --git a/Makefile.in b/Makefile.in
@@ -451,7 +451,7 @@ endif
 	$(DOCGEN)/priv/bin/validate_links.escript $(ERL_TOP) make/$(TARGET)/mod2app.xml \
 		lib/*/doc/xml/*.xml erts/doc/xml/*.xml system/doc/xml/*/*.xml
 
-mod2app: $(ERL_TOP)/make/$(TARGET)/mod2app.xml
+mod2app: doc_bootstrap_build doc_bootstrap_copy $(ERL_TOP)/make/$(TARGET)/mod2app.xml
 
 $(ERL_TOP)/make/$(TARGET)/mod2app.xml: erts/doc/src/Makefile lib/*/doc/src/Makefile 
 	PATH=$(BOOT_PREFIX)"$${PATH}" escript $(BOOTSTRAP_ROOT)/bootstrap/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml