vrifox/website
vrifox/website
1
0
Fork 0
Code Issues 3 Pull requests Activity

fix continous deployment #13

Merged
vrifox merged 6 commits from fix-cd into main 2023-04-05 23:53:25 +02:00
Conversation 0 Commits 6 Files changed 3 +18 -7
3 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.woodpecker.yml
View file

@ -1,9 +1,20 @@
pipeline: pipeline:
build: build-stable:
image: archlinux image: archlinux
commands: commands:
- pacman -Syu --noconfirm hugo git - pacman -Syu --noconfirm hugo git
- hugo --destination /woodpecker/build/ --minify --cleanDestinationDir - 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: upload-stable:
image: archlinux image: archlinux
@ -26,8 +37,8 @@ pipeline:
- echo "$SSH_KEY" > /root/.ssh/id_ed25519 - echo "$SSH_KEY" > /root/.ssh/id_ed25519
- chmod 700 /root/.ssh/id_ed25519 - chmod 700 /root/.ssh/id_ed25519
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config - 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 - 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/" - echo "The preview is now available on https://dev.vrifox.cc/${CI_COMMIT_BRANCH}/${CI_COMMIT_SHA}/"
secrets: [ ssh_key, ssh_port, ssh_host ] secrets: [ ssh_key, ssh_port, ssh_host ]
when: when:
branch: branch:

4
assets/scss/fonts/playfair.scss
View file

@ -1,12 +1,12 @@
@font-face { @font-face {
font-family: "playfair"; font-family: "playfair";
src: local("Playfair"), src: local("Playfair"),
url("/fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2); url("../fonts/playfair/PlayfairDisplay-Regular.woff2") format(woff2);
} }
@font-face { @font-face {
font-family: "playfair"; font-family: "playfair";
src: local("Playfair"), src: local("Playfair"),
url("/fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2); url("../fonts/playfair/PlayfairDisplay-Bold.woff2") format(woff2);
font-weight: bold; font-weight: bold;
} }

4
layouts/partials/sidebar.html
View file

@ -12,9 +12,9 @@
<ul> <ul>
{{- range .Site.Menus.main }} {{- range .Site.Menus.main }}
{{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} {{ if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }}
<li class="active"><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li> <li class="active"><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}" aria-label="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
{{ else }} {{ else }}
<li><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li> <li><a class="hint-text" href="{{ .URL }}" data-title="{{ i18n .Identifier | default .Name }}" aria-label="{{ i18n .Identifier | default .Name }}">{{ partial "helpers/icons" .Identifier }}</a></li>
{{ end }} {{ end }}
{{- end }} {{- end }}
</ul> </ul>