From d67898007a57fb42c00ce2cdef10cd206b0e5447 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 16 Feb 2024 20:50:22 -0800 Subject: [PATCH] ci update to automate deploy --- .woodpecker.yml | 15 ++++++++++++++- config.toml | 49 ++----------------------------------------------- flake.lock | 6 +++--- flake.nix | 4 ++-- wrangler.toml | 3 +++ 5 files changed, 24 insertions(+), 53 deletions(-) create mode 100644 wrangler.toml diff --git a/.woodpecker.yml b/.woodpecker.yml index 6aaa008..83fe4c3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,20 @@ steps: - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf - nix build - nix flake show - - nix flake info + - ls result + - nix develop --command wrangler pages deploy result --branch=$CI_COMMIT_SOURCE_BRANCH --project-name=softinio --commit-dirty=true when: event: [push, pull_request] + - name: deploy + image: nixos/nix + commands: + - echo 'experimental-features = flakes nix-command' >> /etc/nix/nix.conf + - nix build + - nix develop --command wrangler pages deploy result --project-name=softinio --commit-dirty=true + secrets: [ cloudflare_account_id, cloudflare_api_token ] + depends_on: [build] + when: + event: push + branch: main + diff --git a/config.toml b/config.toml index a1fca6b..852bcd0 100644 --- a/config.toml +++ b/config.toml @@ -153,7 +153,7 @@ feed_icon = true # Show the full post content in the Atom feed. # If it's set to false, only the description or summary will be shown. -full_content_in_feed = false +full_content_in_feed = true # Email address for footer's social section. # Protect against spambots: @@ -166,7 +166,7 @@ encode_plaintext_email = false # Setting is ignored if email is already encoded # The icons available can be found in "social_icons" in the "static" folder. socials = [ { name = "xmpp", url = "https://join.jabber.network/#salar@softinio.dev", icon = "xmpp" }, - { name = "matrix", url = "matrix.to/#/@softinio:matrix.org", icon = "matrix" }, + { name = "matrix", url = "https://matrix.to/#/@softinio:matrix.org", icon = "matrix" }, { name = "discord", url = "https://discord.com/users/softinio", icon = "discord" }, { name = "mastodon", url = "https://social.softinio.com/@softinio", icon = "mastodon" }, { name = "x", url = "https://x.com/SalarRahmanian", icon = "x" }, @@ -196,11 +196,6 @@ footer_menu = [ # Markdown is supported (links, emphasis, etc). copyright = "© $CURRENT_YEAR $AUTHOR $SEPARATOR Unless otherwise noted, the content in this website is available under the [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) license. Please attribute properly and link back." -# For multi-language sites, you can set a different copyright for each language. -# The old way of setting `translated_copyright = true` and using i18n files is deprecated. -# If a translation is missing for language, the `copyright` value will be used. -# copyright_translations.es = "$TITLE © $CURRENT_YEAR $AUTHOR $SEPARATOR A menos que se indique lo contrario, el contenido de esta web está disponible bajo la licencia [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)." - # Custom security headers. What urls should your website be able to connect to? # You need to specify the CSP and the URLs associated with the directive. # Useful if you want to load remote content safely (embed YouTube videos, which needs frame-src, for example). @@ -240,46 +235,6 @@ custom_subset = true # Leave this field empty if you're using the service's default hosting. # self_hosted_url = "https://tabi-stats.osc.garden" -# giscus support for comments. https://giscus.app -# Setup instructions: https://welpo.github.io/tabi/blog/comments/#setup -[extra.giscus] -enabled_for_all_posts = false # Enables giscus on all posts. It can be enabled on individual posts by setting `giscus = true` in the [extra] section of a post's front matter. -automatic_loading = true # If set to false, a "Load comments" button will be shown. -repo = "welpo/tabi-comments" -repo_id = "R_kgDOJ59Urw" # Find this value in https://giscus.app/ -category = "Announcements" -category_id = "DIC_kwDOJ59Ur84CX0QG" # Find this value in https://giscus.app/ -mapping = "slug" # Available: pathname; url; title; slug. "slug" will use the post's filename (slug); this is the only way to share comments between languages. -strict_title_matching = 1 # 1 to enable, 0 to disable. https://github.com/giscus/giscus/blob/main/ADVANCED-USAGE.md#data-strict -enable_reactions = 1 # 1 to enable, 0 to disable. -comment_box_above_comments = false -light_theme = "noborder_light" -dark_theme = "noborder_dark" -lang = "" # Leave blank to match the page's language. -lazy_loading = true - -# utterances support for comments. https://utteranc.es -# Setup instructions: https://welpo.github.io/tabi/blog/comments/#setup -[extra.utterances] -enabled_for_all_posts = false # Enables utterances on all posts. It can be enabled on individual posts by setting `utterances = true` in the [extra] section of a post's front matter. -automatic_loading = true # If set to false, a "Load comments" button will be shown. -repo = "yourGithubUsername/yourRepo" # https://utteranc.es/#heading-repository -issue_term = "slug" # Available: pathname; url; title; slug. "slug" will use the post's filename (slug); this is the only way to share comments between languages. https://utteranc.es/#heading-mapping -label = "💬" # https://utteranc.es/#heading-issue-label -light_theme = "github-light" # https://utteranc.es/#heading-theme -dark_theme = "photon-dark" # https://utteranc.es/#heading-theme -lazy_loading = true - -# Hyvor Talk support for comments. https://talk.hyvor.com -[extra.hyvortalk] -enabled_for_all_posts = false # Enables hyvortalk on all posts. It can be enabled on individual posts by setting `hyvortalk = true` in the [extra] section of a post's front matter. -automatic_loading = true # If set to false, a "Load comments" button will be shown. -website_id = "1234" -page_id_is_slug = true # If true, it will use the post's filename (slug) as id; this is the only way to share comments between languages. If false, it will use the entire url as id. -lang = "" # Leave blank to match the page's language. -page_author = "" # Email (or base64 encoded email) of the author. -lazy_loading = true - # Isso support for comments. https://isso-comments.de/ # You need to self-host the backend first: https://blog.phusion.nl/2018/08/16/isso-simple-self-hosted-commenting-system/ # More info on some settings: https://isso-comments.de/docs/reference/client-config/ diff --git a/flake.lock b/flake.lock index 45061fd..a8a6541 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1707956935, + "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 392828c..f109024 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ name = "softinio-${system}"; version = "0.1"; src = ./.; - nativeBuildInputs = with pkgs; [ zola ]; + nativeBuildInputs = with pkgs; [ nodePackages_latest.wrangler zola ]; configurePhase = '' mkdir -p themes ln -snf "${theme}" "themes/${themeName}" @@ -45,7 +45,7 @@ pkgs = nixpkgsFor.${system}; in { default = pkgs.mkShell { - buildInputs = with pkgs; [ zola ]; + buildInputs = with pkgs; [ nodePackages_latest.wrangler zola ]; shellHook = '' mkdir -p themes ln -snf "${theme}" "themes/${themeName}" diff --git a/wrangler.toml b/wrangler.toml new file mode 100644 index 0000000..ca07018 --- /dev/null +++ b/wrangler.toml @@ -0,0 +1,3 @@ +name = "softinio" +route = { pattern = "https://www.softinio.com", custom_domain = true } +