diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml index d6e49ee..fc15428 100644 --- a/.github/workflows/site.yml +++ b/.github/workflows/site.yml @@ -27,20 +27,15 @@ jobs: - name: Install Emacs uses: purcell/setup-emacs@master with: - version: 28.2 + version: 29.3 - - name: Prepare + - name: make run: | - curl "https://raw.githubusercontent.com/dongdigua/configs/main/.tmux.conf" -o misc/tmux.conf - - - name: Build with Org - run: | - make describe - cd org - make clean + sudo apt -q install pandoc make - cd .. + curl "https://raw.githubusercontent.com/dongdigua/configs/main/.tmux.conf" -o misc/tmux.conf ./patches/txt.sh + ./patches/color.sh - name: Setup Pages uses: actions/configure-pages@v2 @@ -51,16 +46,6 @@ jobs: source: ./ destination: ./_site - - name: Post-Jekyll Build - run: | - tree - cd _site - sudo ./patches/color.sh - sudo apt install pandoc - # use jekyll to check link but actually use pandoc - sudo pandoc posts.md --css=css/everforest.css -s -o posts.html - - - name: Upload artifact uses: actions/upload-pages-artifact@v1 diff --git a/Makefile b/Makefile index 7764c37..3b5238b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ -all: org posts gmi +all: describe org posts gmi +.PHONY: org org: - cd org && make + cd org; $(MAKE) + pwd posts: pandoc posts.md --css=css/everforest.css -s -o posts.html @@ -10,7 +12,6 @@ gmi: misc/mdlist2gmi.py > posts.gmi describe: - git describe --tags HEAD sed -i "s/\$$v\\$$/\$$v: $$(git describe --tags HEAD)\\$$/g" index.html clean: