From 27ea7461691d9a03b050a855781327d99e3cef45 Mon Sep 17 00:00:00 2001 From: Liu Wenyuan <15816141883@163.com> Date: Fri, 5 Jul 2024 10:19:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A5ruby=203.1.6=E4=B8=BA=E5=8F=82?= =?UTF-8?q?=E7=85=A7=E6=9B=B4=E6=96=B0bundler=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-to-gh-pages.yml | 4 +- .gitignore | 3 +- Gemfile.lock | 48 ++++++++++++++---------- 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy-to-gh-pages.yml b/.github/workflows/deploy-to-gh-pages.yml index be8c0f5..3cef73d 100644 --- a/.github/workflows/deploy-to-gh-pages.yml +++ b/.github/workflows/deploy-to-gh-pages.yml @@ -27,9 +27,9 @@ jobs: - name: 获取代码 uses: actions/checkout@v3 - name: 配置 Ruby - uses: ruby/setup-ruby@v1 # v1.127.0 + uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: - ruby-version: 3.2 + ruby-version: 3.1 rubygems: latest bundler-cache: true cache-version: 0 # Increment this number if you need to re-download cached gems diff --git a/.gitignore b/.gitignore index 378676a..1778802 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules _site -.bundle \ No newline at end of file +.bundle +.jekyll-cache \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e531cf2..74d20fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,22 +1,28 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.17.0) + ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) - google-protobuf (3.21.12) - google-protobuf (3.21.12-x86_64-linux) + google-protobuf (4.27.2) + bigdecimal + rake (>= 13) + google-protobuf (4.27.2-x86_64-linux) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (4.3.2) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -53,27 +59,29 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) - listen (3.8.0) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.1) - rake (13.0.6) + public_suffix (6.0.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.30.0) + rexml (3.3.1) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.57.1) - google-protobuf (~> 3.21) - rake (>= 10.0.0) + sass-embedded (1.77.5) + google-protobuf (>= 3.25, < 5.0) + rake (>= 13) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.4.2) - webrick (1.7.0) + unicode-display_width (2.5.0) + webrick (1.8.1) PLATFORMS arm-linux-androideabi @@ -94,4 +102,4 @@ DEPENDENCIES wdm (~> 0.1.1) BUNDLED WITH - 2.3.18 + 2.3.27 From 5c3d6d8e796febeb6e0c897735174a8164128291 Mon Sep 17 00:00:00 2001 From: Liu Wenyuan <15816141883@163.com> Date: Fri, 5 Jul 2024 10:25:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-to-gh-pages.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-to-gh-pages.yml b/.github/workflows/deploy-to-gh-pages.yml index 3cef73d..f7affc3 100644 --- a/.github/workflows/deploy-to-gh-pages.yml +++ b/.github/workflows/deploy-to-gh-pages.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: 获取代码 - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 配置 Ruby uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 with: @@ -35,13 +35,13 @@ jobs: cache-version: 0 # Increment this number if you need to re-download cached gems - name: 配置 Pages id: pages - uses: actions/configure-pages@v2 + uses: actions/configure-pages@v5 - name: 生成网站 run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" env: JEKYLL_ENV: production - name: 上传结果 - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 deploy: name: 部署 @@ -53,4 +53,4 @@ jobs: steps: - name: 部署到 GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4