diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index 9164159..45bb128 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -34,49 +34,49 @@ concurrency: cancel-in-progress: false jobs: - # Build job 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 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.0' # Specify the Ruby version you are using + + - name: Install dependencies + run: bundle install + + - name: Build Jekyll site + run: bundle exec jekyll build + + - name: Upload _site for deployment + uses: actions/upload-artifact@v2 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 + name: _site + path: _site - # Deployment job deploy: + runs-on: ubuntu-latest + needs: build environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - needs: build steps: - name: Checkout main branch 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: Download _site + uses: actions/download-artifact@v2 + with: + name: _site + path: _site + - name: Deploy to GitHub Pages uses: jeffreytse/jekyll-deploy-action@v0.5.1 with: @@ -87,3 +87,4 @@ jobs: jekyll_src: "./" jekyll_cfg: "_config.yml" jekyll_baseurl: "/2nd-Minima" + bundler_ver: '<= 2.4.22' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 1c7a84e..80427cf 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-arm64-darwin) http_parser.rb (0.8.0) i18n (1.14.1) concurrent-ruby (~> 1.0) @@ -71,7 +71,7 @@ GEM 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-arm64-darwin) google-protobuf (~> 3.25) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -80,7 +80,6 @@ GEM PLATFORMS arm64-darwin-22 - ruby DEPENDENCIES bundler @@ -88,4 +87,4 @@ DEPENDENCIES minima! BUNDLED WITH - 2.5.4 + 2.4.22 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 @@ - - -