Skip to content

Commit

Permalink
Use new Makefile targets in the Vulkan-Docs directory
Browse files Browse the repository at this point in the history
Very temporary change to ci.yml to pull from the Vulkan-Docs branch with
that change, prior to it being merged, to ensure the site build in this
repo works.
  • Loading branch information
oddhack committed Oct 22, 2024
1 parent c3742fb commit 7c53f0c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
with:
repository: KhronosGroup/Vulkan-Docs
path: ./Vulkan-Docs
ref: main
ref: antora-makefile
submodules: recursive

- name: "Checkout Vulkan Samples"
Expand Down
14 changes: 9 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ init: subrepos
(echo Installing node modules in $$dir: && cd $$dir && npm install) ; \
done

subrepos: $(REPONAMES)
subrepos:
for repo in $(REPONAMES) ; do \
echo Cloning $$repo && \
test -d $$repo || git clone [email protected]:KhronosGroup/$$repo.git ; \
if test -d $$repo ; then \
echo "Not cloning repo $$repo, already exists" ; \
else \
git clone [email protected]:KhronosGroup/$$repo.git ; \
fi ; \
done

# Build UI bundle
Expand All @@ -65,12 +69,12 @@ build-ui:
prep-sources: prep-docs prep-guide prep-samples prep-tutorial

# Prepare Vulkan-Docs
GENPATH = Vulkan-Docs/antora/spec/modules/ROOT/partials/gen
GENPATH = Vulkan-Docs/gen
prep-docs:
make -C Vulkan-Docs -f antora/Makefile clean setup
make -C Vulkan-Docs setup_antora
cp $(GENPATH)/apimap.cjs \
$(GENPATH)/pageMap.cjs \
Vulkan-Docs/antora/spec/xrefMap.cjs \
$(GENPATH)/xrefMap.cjs \
docs-site/js/

prep-guide:
Expand Down

0 comments on commit 7c53f0c

Please sign in to comment.