diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 9164159..7f33867 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -38,27 +38,20 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Checkout + - name: Checkout main branch uses: actions/checkout@v4 with: ref: "main" - - name: Setup Ruby - uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0 + + - uses: actions/cache@v3 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: 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 + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- # Deployment job deploy: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build steps: @@ -66,17 +59,7 @@ jobs: uses: actions/checkout@v4 with: ref: "main" - - name: Copy _site contents - run: | - cp -r _site/ Gemfile _config.yml /tmp/ - git checkout -b _site - rm -rf * - cp -r /tmp/_site/* /tmp/Gemfile /tmp/_config.yml ./ - git add --all - git config user.name github-actions - git config user.email github-actions@github.com - git commit -m "update _site content" - git push --force origin _site + - name: Deploy to GitHub Pages uses: jeffreytse/jekyll-deploy-action@v0.5.1 with: @@ -86,4 +69,4 @@ jobs: branch: "_site" jekyll_src: "./" jekyll_cfg: "_config.yml" - jekyll_baseurl: "/2nd-Minima" + jekyll_baseurl: "/2nd-Minima" \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 1c7a84e..67f99e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,14 +12,14 @@ GEM 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.16.3) forwardable-extended (2.6.0) - google-protobuf (3.25.1-arm64-darwin) + google-protobuf (3.25.2) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -59,27 +59,30 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - nokogiri (1.16.0-arm64-darwin) + mini_portile2 (2.8.5) + nokogiri (1.16.0) + mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (5.0.4) racc (1.7.3) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.6) rouge (4.2.0) safe_yaml (1.0.5) - sass-embedded (1.69.7-arm64-darwin) + sass-embedded (1.70.0) google-protobuf (~> 3.25) + rake (>= 13.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) unicode-display_width (2.5.0) webrick (1.8.1) PLATFORMS - arm64-darwin-22 ruby DEPENDENCIES @@ -88,4 +91,4 @@ DEPENDENCIES minima! BUNDLED WITH - 2.5.4 + 2.1.4 diff --git a/_site/2022/11/28/How-to-post-posts.html b/_site/2022/11/28/How-to-post-posts.html index 6ff8fd2..c0784e4 100644 --- a/_site/2022/11/28/How-to-post-posts.html +++ b/_site/2022/11/28/How-to-post-posts.html @@ -1,5 +1,5 @@ - + @@ -27,19 +27,7 @@ - - -