rebase from master

Author: jwcooper

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
       - main
   schedule:
     - cron: 0 10 * * *
+  pull_request:
 
 jobs:
   check-repo-owner:
@@ -31,7 +32,7 @@ jobs:
         submodules: true
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.0
         bundler-cache: true
     - name: Install Dependencies
       run: |
@@ -40,18 +41,10 @@ jobs:
     - name: Build site with jekyll
       run: |
         bundle exec jekyll build -d build
-    - name: Commit and Push to gh-pages
-      run: |
-        # https://github.com/helaili/jekyll-action/blob/master/entrypoint.sh#L49
-        cd build
-        touch .nojekyll
-        git init
-        git config user.name "${GITHUB_ACTOR}"
-        git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-        git add .
-        git commit -m 'jekyll build from Action'
-        git push --force https://${ADABOT_PAT}@github.com/${GITHUB_REPOSITORY}.git HEAD:gh-pages
-        rm -fr .git
-        cd ..
-      env:
-        ADABOT_PAT: ${{ secrets.ADABOT_PAT }}
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./build
+          cname: circuitpython.org
+      if: github.event_name != 'pull_request'

.github/workflows/images.yml

@@ -1,12 +1,26 @@
-name: Compress images
-on: pull_request
+name: Compress Images
+on:
+  pull_request:
+    # Run Image Actions when JPG, JPEG, PNG or WebP files are added or changed.
+    # See https://help.github.com/en/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#onpushpull_requestpaths for reference.
+    paths:
+      - '**.jpg'
+      - '**.jpeg'
+      - '**.png'
+      - '**.webp'
 jobs:
   build:
+    # Only run on Pull Requests within the same repository, and not from forks.
+    if: github.event.pull_request.head.repo.full_name == github.repository
     name: calibreapp/image-actions
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: calibreapp/image-actions
-        uses: docker://calibreapp/github-image-actions
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+
+      - name: Compress Images
+        uses: calibreapp/image-actions@main
+        with:
+          # The `GITHUB_TOKEN` is automatically generated by GitHub and scoped only to the repository that is currently running the action. By default, the action can’t update Pull Requests initiated from forked repositories.
+          # See https://docs.github.com/en/actions/reference/authentication-in-a-workflow and https://help.github.com/en/articles/virtual-environments-for-github-actions#token-permissions
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,7 @@
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache
 .DS_Store
 _drafts/
 .bundle

.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.2

Gemfile

@@ -8,12 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-# gem "jekyll", "~> 3.8.4"
-
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-gem "github-pages", group: :jekyll_plugins
+gem "jekyll", "~> 4.2"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
@@ -29,3 +24,5 @@ group :development do
   gem 'image_processing'
 end
 
+
+gem "webrick", "~> 1.7"