mirror of
https://github.com/mrrpnya/lipu-sona.git
synced 2025-02-13 16:44:39 +00:00
replaced "out" with "public" as site directory
This commit is contained in:
parent
89b1e88f70
commit
e768e64c2e
2 changed files with 6 additions and 6 deletions
|
@ -15,12 +15,12 @@ build-job: # This job runs in the build stage, which runs first.
|
|||
- make THEME=discount-theme
|
||||
artifacts:
|
||||
paths:
|
||||
- "out"
|
||||
- "public"
|
||||
|
||||
unit-test-job: # This job runs in the test stage.
|
||||
stage: test # It only starts when the job in the build stage completes successfully.
|
||||
script:
|
||||
- test $(stat -c %s out/index.html) -gt 0 #test that the index file exists
|
||||
- test $(stat -c %s public/index.html) -gt 0 #test that the index file exists
|
||||
|
||||
deploy-job: # This job runs in the deploy stage.
|
||||
stage: deploy # It only runs when *both* jobs in the test stage complete successfully.
|
||||
|
@ -36,5 +36,5 @@ deploy-job: # This job runs in the deploy stage.
|
|||
- curl https://gitlab.com/dev_urandom/neocities-uploader/-/raw/main/upload.sh?inline=false > upload.sh
|
||||
- chmod +x upload.sh
|
||||
script:
|
||||
- rsync -e "ssh -o StrictHostKeyChecking=no" -ciIlprz out/ deploy@devurandom.xyz:~/out/
|
||||
- rsync -e "ssh -o StrictHostKeyChecking=no" -ciIlprz public/ deploy@devurandom.xyz:~/out/
|
||||
- ./upload.sh
|
||||
|
|
6
Makefile
6
Makefile
|
@ -1,6 +1,6 @@
|
|||
-include Makefile.cfg
|
||||
|
||||
OUTDIR=out
|
||||
OUTDIR=public
|
||||
PAGEDIR=pages
|
||||
SRCDIR=src
|
||||
TPLDIR=tpl
|
||||
|
@ -30,7 +30,7 @@ DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES))
|
|||
|
||||
_STATIC_FILES = $(shell find -L static/ -type f -name \* | grep -v \\.h$)
|
||||
_STATIC_HEADERS = $(shell find -L static/ -type f -name \*\\.h)
|
||||
OUT_STATIC = $(patsubst static/%,out/%,$(_STATIC_FILES)) $(patsubst static/%.h,out/%,$(_STATIC_HEADERS))
|
||||
OUT_STATIC = $(patsubst static/%,public/%,$(_STATIC_FILES)) $(patsubst static/%.h,public/%,$(_STATIC_HEADERS))
|
||||
|
||||
.SUFFIXES:
|
||||
.PHONY: all upload
|
||||
|
@ -92,4 +92,4 @@ $(OUTDIR)/%: static/%
|
|||
cp -r $< $@
|
||||
|
||||
clean:
|
||||
rm -rf out/* pages/blog/index.md
|
||||
rm -rf public/* pages/blog/index.md
|
||||
|
|
Loading…
Add table
Reference in a new issue