diff --git a/.woodpecker.yml b/.woodpecker.yml index 2877d9d..b80af5e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,9 +1,20 @@ pipeline: - build: + build-stable: image: archlinux commands: - pacman -Syu --noconfirm hugo git - hugo --destination /woodpecker/build/ --minify --cleanDestinationDir + when: + branch: [ main ] + + build-dev: + image: archlinux + commands: + - pacman -Syu --noconfirm hugo git + - hugo --destination /woodpecker/build/ --baseURL "https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" --cleanDestinationDir + when: + branch: + exclude: [ main ] upload-stable: image: archlinux @@ -26,8 +37,8 @@ pipeline: - echo "$SSH_KEY" > /root/.ssh/id_ed25519 - chmod 700 /root/.ssh/id_ed25519 - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config - - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc-dev/CI_COMMIT_BRANCH/$CI_COMMIT_SHA/ --mkpath --checksum - - echo "The preview is now available on https://dev.vrifox.cc/CI_COMMIT_BRANCH/$CI_COMMIT_SHA/" + - rsync -rv --delete -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ caddy@$SSH_HOST:/var/lib/caddy/woodpecker/vrifox.cc-dev/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/ --mkpath --checksum + - echo "The preview is now available on https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/" secrets: [ ssh_key, ssh_port, ssh_host ] when: branch: diff --git a/assets/scss/fonts/playfair.scss b/assets/scss/fonts/playfair.scss index 12f2d93..0c3db89 100644 --- a/assets/scss/fonts/playfair.scss +++ b/assets/scss/fonts/playfair.scss @@ -1,12 +1,12 @@ @font-face { font-family: "playfair"; src: local("Playfair"), - url("/fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2); + url("../fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2); } @font-face { font-family: "playfair"; src: local("Playfair"), - url("/fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2); + url("../fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2); font-weight: bold; } \ No newline at end of file diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html index 6a1084f..73de7c4 100644 --- a/layouts/partials/sidebar.html +++ b/layouts/partials/sidebar.html @@ -12,9 +12,9 @@