From 54b530c00948ae2030435249aaa3f2f1f7a5974f Mon Sep 17 00:00:00 2001 From: Liudon Date: Fri, 27 Sep 2024 13:33:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0host=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gh-pages.yml | 15 +-- .github/workflows/ipfs.yml | 8 -- layouts/partials/extend_footer.html | 23 ++++ layouts/partials/head.html | 167 ---------------------------- 4 files changed, 31 insertions(+), 182 deletions(-) delete mode 100644 layouts/partials/head.html diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 20c665e9c..4c8cfcc5f 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -53,11 +53,12 @@ jobs: ls -l ./ hugo --gc --minify --cleanDestinationDir - - name: Push - uses: peaceiris/actions-gh-pages@v4 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 with: - github_token: ${{ secrets.TOKEN }} - publish_branch: master - force_orphan: true - publish_dir: ./public - cname: liudon.com \ No newline at end of file + # Upload dist repository + path: './public' + + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/.github/workflows/ipfs.yml b/.github/workflows/ipfs.yml index c293a17e4..c14cbe92e 100644 --- a/.github/workflows/ipfs.yml +++ b/.github/workflows/ipfs.yml @@ -55,14 +55,6 @@ jobs: hugo-version: 'latest' extended: true - - name: Update config.yml - uses: fjogeleit/yaml-update-action@main - with: - valueFile: 'config.yml' - propertyPath: 'params.robotsNoIndex' - value: "!!bool 'true'" - commitChange: false - - name: Build run: | hugo --gc --minify --cleanDestinationDir diff --git a/layouts/partials/extend_footer.html b/layouts/partials/extend_footer.html index 704cfcfe0..ebdf3ac1d 100644 --- a/layouts/partials/extend_footer.html +++ b/layouts/partials/extend_footer.html @@ -17,6 +17,29 @@ {{- end }} + diff --git a/layouts/partials/head.html b/layouts/partials/head.html deleted file mode 100644 index 7eddbf73f..000000000 --- a/layouts/partials/head.html +++ /dev/null @@ -1,167 +0,0 @@ - - - -{{- if hugo.IsProduction | or (eq site.Params.env "production") | and (ne (.Params.robotsNoIndex | default site.Params.robotsNoIndex) true) }} - -{{- else }} - -{{- end }} - -{{- /* Title */}} -{{ if .IsHome }}{{ else }}{{ if .Title }}{{ .Title }} | {{ end }}{{ end }}{{ site.Title }} - -{{- /* Meta */}} -{{- if .IsHome }} -{{ with site.Params.keywords -}}{{ end }} -{{- else }} - -{{- end }} - - - -{{- if site.Params.analytics.google.SiteVerificationTag }} - -{{- end }} -{{- if site.Params.analytics.yandex.SiteVerificationTag }} - -{{- end }} -{{- if site.Params.analytics.bing.SiteVerificationTag }} - -{{- end }} - -{{- /* Styles */}} - -{{- /* includes */}} -{{- $includes := slice }} -{{- $includes = $includes | append (" " | resources.FromString "assets/css/includes-blank.css")}} - -{{- if not (eq site.Params.assets.disableScrollBarStyle true) }} - {{- $ScrollStyle := (resources.Get "css/includes/scroll-bar.css") }} - {{- $includes = (append $ScrollStyle $includes) }} -{{- end }} - -{{- $includes_all := $includes | resources.Concat "assets/css/includes.css" }} - -{{- $theme_vars := (resources.Get "css/core/theme-vars.css") }} -{{- $reset := (resources.Get "css/core/reset.css") }} -{{- $media := (resources.Get "css/core/zmedia.css") }} -{{- $license_css := (resources.Get "css/core/license.css") }} -{{- $common := (resources.Match "css/common/*.css") | resources.Concat "assets/css/common.css" }} - -{{- /* include `an-old-hope` if hljs is on */}} -{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default false) }} -{{- $hljs := (cond ($isHLJSdisabled) (".chroma { background-color: unset !important;}" | resources.FromString "assets/css/hljs-blank.css") (resources.Get "css/hljs/an-old-hope.min.css")) }} - -{{- /* order is important */}} -{{- $core := (slice $theme_vars $reset $common $hljs $includes_all $media) | resources.Concat "assets/css/core.css" | resources.Minify }} -{{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" | resources.Minify }} - -{{- /* bundle all required css */}} -{{- /* Add extended css after theme style */ -}} -{{- $stylesheet := (slice $license_css $core $extended) | resources.Concat "assets/css/stylesheet.css" }} - -{{- if not site.Params.assets.disableFingerprinting }} -{{- $stylesheet := $stylesheet | fingerprint }} - -{{- else }} - -{{- end }} - -{{- /* Search */}} -{{- if (eq .Layout `search`) -}} - -{{- $fastsearch := resources.Get "js/fastsearch.js" | js.Build (dict "params" (dict "fuseOpts" site.Params.fuseOpts)) | resources.Minify }} -{{- $fusejs := resources.Get "js/fuse.basic.min.js" }} -{{- $license_js := resources.Get "js/license.js" }} -{{- if not site.Params.assets.disableFingerprinting }} -{{- $search := (slice $fusejs $license_js $fastsearch ) | resources.Concat "assets/js/search.js" | fingerprint }} - -{{- else }} -{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" }} - -{{- end }} -{{- end -}} - -{{- /* Highlight.js */}} -{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default .Params.disableHLJS ) }} -{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }} -{{- if not site.Params.assets.disableFingerprinting }} -{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | fingerprint }} - -{{- else }} -{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" }} - -{{- end }} -{{- end }} - -{{- /* Favicons */}} - - - - - - - - -{{- /* RSS */}} -{{ range .AlternativeOutputFormats -}} - -{{ end -}} -{{- range .AllTranslations -}} - -{{ end -}} - - - -{{- partial "extend_head.html" . -}} - -{{- /* Misc */}} -{{- if hugo.IsProduction | or (eq site.Params.env "production") }} -{{- template "_internal/google_analytics.html" . }} -{{- template "partials/templates/opengraph.html" . }} -{{- template "partials/templates/twitter_cards.html" . }} -{{- template "partials/templates/schema_json.html" . }} -{{- end -}}