Skip to content

Commit aa3c673

Browse files
authored
Add deps-docs command to makefile (#23686)
Refactored `deps-docs` out of `docs` because #23629 broke Gitpod's docs setup (which grepped to get the hugo install command). Now `make deps` really installs everything to develop (includes `docs`).
1 parent d673a6f commit aa3c673

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.gitpod.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ tasks:
2424
make watch-frontend
2525
openMode: split-right
2626
- name: Run docs
27-
before: sudo bash -c "$(grep 'https://github.com/gohugoio/hugo/releases/download' Makefile | tr -d '\')" # install hugo
28-
command: cd docs && make clean update && hugo server -D -F --baseUrl $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
27+
command: |
28+
gp sync-await setup
29+
cd docs
30+
make clean update
31+
hugo server -D -F --baseUrl $(gp url 1313) --liveReloadPort=443 --appendPort=false --bind=0.0.0.0
2932
openMode: split-right
3033

3134
vscode:

Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ help:
189189
@echo " - clean delete backend and integration files"
190190
@echo " - clean-all delete backend, frontend and integration files"
191191
@echo " - deps install dependencies"
192+
@echo " - deps-docs install docs dependencies"
192193
@echo " - deps-frontend install frontend dependencies"
193194
@echo " - deps-backend install backend dependencies"
194195
@echo " - deps-tools install tool dependencies"
@@ -816,14 +817,17 @@ release-docs: | $(DIST_DIRS) docs
816817
tar -czf $(DIST)/release/gitea-docs-$(VERSION).tar.gz -C ./docs/public .
817818

818819
.PHONY: docs
819-
docs:
820+
docs: deps-docs
821+
cd docs; make trans-copy clean build-offline;
822+
823+
.PHONY: deps-docs
824+
deps-docs:
820825
@hash hugo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
821-
curl -sL https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_$(HUGO_VERSION)_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo /usr/bin/hugo && chmod +x /usr/bin/hugo; \
826+
curl -sL https://github.com/gohugoio/hugo/releases/download/v$(HUGO_VERSION)/hugo_$(HUGO_VERSION)_Linux-64bit.tar.gz | tar zxf - -C /tmp && mv /tmp/hugo ~/go/bin/hugo && chmod +x ~/go/bin/hugo; \
822827
fi
823-
cd docs; make trans-copy clean build-offline;
824828

825829
.PHONY: deps
826-
deps: deps-frontend deps-backend deps-tools
830+
deps: deps-frontend deps-backend deps-tools deps-docs
827831

828832
.PHONY: deps-frontend
829833
deps-frontend: node_modules

0 commit comments

Comments
 (0)