Merge pull request #12 from abdnh/deploy

Update publishing workflow

Author: abdnh

.github/workflows/gh-pages.yml

@@ -1,35 +1,52 @@
-name: GitHub Pages
+name: Deploy Jekyll site to Pages
 
 on:
   push:
-    branches:
-      - master
+    branches: ["master"]
 
-jobs:
-  jekyll:
-    runs-on: ubuntu-latest
-    steps:
-      - name: setup
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
+  workflow_dispatch:
 
-      - name: 💎 set up ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
-      # - name: set up Node.js
-      #   run: sudo apt-get install nodejs
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
-      - name: install dependencies & build site
-        uses: limjh16/jekyll-action-ts@v2
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        # https://github.com/ruby/setup-ruby/releases/tag/v1.207.0
+        uses: ruby/setup-ruby@4a9ddd6f338a97768b8006bf671dfbad383215f4
         with:
-          enable_cache: true
+          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@v5
+      - 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
 
-      - name: deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./_site
-          publish_branch: gh-pages
+  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@v5

Makefile

@@ -4,8 +4,3 @@ all: serve
 
 serve:
 	bundle exec jekyll serve --watch
-
-deploy:
-	git checkout master
-	git push
-	./deploy.sh

README.md

@@ -4,11 +4,7 @@ My personal blog in Arabic. Built with Jekyll.
 
 ## Build Instructions
 
-I deploy the site using an [action](.github/workflows/gh-pages.yml),
-and don't use Github-provided Jekyll setup because
-some of the plugins I need are not whitelisted.
-
-Some notes about building the site on Windows (mostly for my future self)
+Some notes about building the site locally on Windows (mostly for my future self)
 because that's what I normally use and because it's apparently more pain
 than other platforms:
 

_config.yml

@@ -22,7 +22,6 @@ include:
 exclude:
   - Makefile
   - TODO.md
-  - deploy.sh
 
 jekyll-archives:
   enabled: ['categories', 'tags']