From 03574131f5fa1e3a789f35959c4cfaeef88e0e32 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 7 Jun 2023 11:03:48 +0200 Subject: fix make wget w/ live reload A newer version of Jekyll breaks wget with --livereload and --convert-links. --- .github/workflows/jekyll.yml | 2 +- Makefile | 7 +++++++ _config.yml | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 74520f8..5b6980a 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -22,7 +22,7 @@ jobs: run: make build - name: Check integrity run: | - nohup make serve & + nohup make serve LIVE_RELOAD=0 & sleep 3 && make wget - name: Set up ssh-agent uses: webfactory/ssh-agent@v0.7.0 diff --git a/Makefile b/Makefile index 4a3572f..132d8ca 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ ifeq ($$(origin $(1)),command line) endif endef +LIVE_RELOAD ?= 1 +$(eval $(call noexpand,LIVE_RELOAD)) + .PHONY: all all: serve @@ -39,7 +42,11 @@ build: .PHONY: serve serve: +ifeq ($(LIVE_RELOAD),1) + $(jekyll) serve --livereload +else $(jekyll) serve +endif URL := http://localhost:4000/ SKIP := -R cv.pdf -X /blog,/jekyll-theme,/sorting-algorithms,/status,/void,/wireguard-config diff --git a/_config.yml b/_config.yml index 6b706f2..92b51e4 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,6 @@ # Jekyll baseurl: '' host: 0.0.0.0 -livereload: true open_url: true show_drafts: true strict_front_matter: true -- cgit v1.2.3