[pull] master from tw93:master

.github/workflows/jekyll.yml

@@ -0,0 +1,64 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v4
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

Gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem 'jekyll'
+gem "jekyll"
 gem 'jekyll-paginate'
 gem 'jekyll-sitemap'
 gem "jekyll-pdf-embed"
+gem 'jekyll-feed'

Gemfile.lock

@@ -1,22 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.4)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    google-protobuf (3.23.4-arm64-darwin)
-    google-protobuf (3.23.4-x86_64-darwin)
+    google-protobuf (3.25.2)
+    google-protobuf (3.25.2-aarch64-linux)
+    google-protobuf (3.25.2-arm64-darwin)
+    google-protobuf (3.25.2-x86-linux)
+    google-protobuf (3.25.2-x86_64-darwin)
+    google-protobuf (3.25.2-x86_64-linux)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.2)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -32,6 +36,8 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
     jekyll-pdf-embed (1.1.3)
       jekyll
@@ -52,31 +58,71 @@ GEM
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.6)
-    rouge (4.1.3)
+    rouge (4.2.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.64.2-arm64-darwin)
-      google-protobuf (~> 3.23)
-    sass-embedded (1.64.2-x86_64-darwin)
-      google-protobuf (~> 3.23)
+    sass-embedded (1.70.0-aarch64-linux-android)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-aarch64-linux-gnu)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-aarch64-linux-musl)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-arm-linux-androideabi)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-arm-linux-gnueabihf)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-arm-linux-musleabihf)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-arm64-darwin)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86-linux-android)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86-linux-gnu)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86-linux-musl)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-darwin)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-linux-android)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-linux-gnu)
+      google-protobuf (~> 3.25)
+    sass-embedded (1.70.0-x86_64-linux-musl)
+      google-protobuf (~> 3.25)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
 
 PLATFORMS
-  arm64-darwin-22
-  x86_64-darwin-21
+  aarch64-linux
+  aarch64-linux-android
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-androideabi
+  arm-linux-gnueabihf
+  arm-linux-musleabihf
+  arm64-darwin
+  x86-linux
+  x86-linux-android
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-android
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   jekyll
+  jekyll-feed
   jekyll-paginate
   jekyll-pdf-embed
   jekyll-sitemap
 
 BUNDLED WITH
-   2.3.15
+   2.5.6

_config.yml

@@ -1,59 +1,71 @@
-title:            Tw93
-description:      "Hi，我是 Tw93，是一个前端工程师，会一点 Swift / Rust / Python，喜欢折腾各种新技术。"
+# Site Information
+title: Tw93
+description: "一个喜欢开源和折腾的工程师"
+url: https://tw93.fun
+repo: tw93/tw93.github.io
+lang: zh-CN
+timezone: Africa/El_Aaiun
 
+# Social Media and External URLs
 github: tw93
 zhihu: tw93
 twitter: HiTw93
 v2ex: tw93
-
-url: https://tw93.fun
 menu:
-  - title: 'Categories'
-    url: '/categories.html'
-  - title: 'About'
-    url: '/about'
-  - title: 'Weekly'
-    url: 'https://weekly.tw93.fun/'
-  - title: 'Github'
-    url: 'https://github.com/tw93'
-  - title: 'RSS'
-    url: '/feed.xml'
-
-timezone:    Africa/El_Aaiun
-locale:      zh_CN
-lang:      zh-cmn-Hans
-future:      true
-highlighter: rouge
-markdown:    kramdown
-sass:
-  sass_dir: _sass
-  style: compressed
-
-permalink:   /:year-:month-:day/:title.html
-assetUrl: //tw93.fun/images/
-defaultImage: data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==
+  - title: "Categories"
+    url: "/categories.html"
+  - title: "About"
+    url: "/about.html"
+  - title: "Weekly"
+    url: "https://weekly.tw93.fun/"
 
-google_analytics: UA-57207999-1
-baidu_verify: kxGpkpWG7G
-google_verify: DbapjTyfmMvvmkuA1GiGcXMqgPQrtgxeUTGY-MrEOYw
+# SEO and Analytics
+google_analytics: G-KS7EDB6BRM
 
+# Build Settings
 paginate: 10
 post_ext: md
 page_ext: md
 post_layout: post
 page_layout: page
 titlecase: true
+future: true
+highlighter: rouge
+markdown: kramdown
+permalink: /:year-:month-:day/:title.html
+sass:
+  sass_dir: _sass
+  style: compressed
 
-showBuyCoffee: true
-payImage: //gw.alipayobjects.com/zos/k/vb/1.png
+collections:
+  posts:
+    output: true
+    permalink: /:year-:month-:day/:title.html
+  posts_en:
+    output: true
+    permalink: /en/:year-:month-:day/:title.html
+    sort_by: date
 
 include: [".htaccess"]
-exclude: ["Gemfile", "Gemfile.lock", "README.md", "LICENSE", "package.json","node_modules"]
-gems:
-  - jekyll-paginate
-  - jekyll-sitemap
-  - jekyll-feed
+exclude:
+  [
+    "Gemfile",
+    "Gemfile.lock",
+    "README.md",
+    "LICENSE",
+    "package.json",
+    "node_modules",
+  ]
 
+# Plugins
 plugins:
   - jekyll-paginate
   - jekyll-pdf-embed
+  - jekyll-sitemap
+  - jekyll-feed
+
+# Custom Site Settings
+showBuyCoffee: true
+payImage: //gw.alipayobjects.com/zos/k/vb/1.png
+assetUrl: //tw93.fun/images/
+defaultImage: data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==

_includes/buy-me-coffee.html

@@ -1,10 +1,12 @@
 {% if site.showBuyCoffee != false %}
 <div class="coffee">
-  <a
-    class="buy-me-coffee"
-    href="https://miaoyan.app/cats.html?name=Blog"
-    target="_blank"
-    >喜欢文章 → 去喂猫❤️</a
-  >
+  <a class="buy-me-coffee" href="https://miaoyan.app/cats.html?name=Blog" target="_blank">
+    {% if page.lang == 'en-US' %}
+    Like the article ❤️
+    {% else %}
+    给汤圆可乐喂罐头❤️
+    {% endif %}
+  </a>
+
 </div>
 {% endif %}