Merge branch 'master' of file:///home/seanho/Documents/sermons/reveal-skel

Author: seanho00

.github/workflows/build.yml

@@ -1,33 +1,51 @@
-name: Build static site
+name: Build and deploy static site
 on:
   push:
     branches: 
     - master
     - $default-branch
   workflow_dispatch:
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repo from Github
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Update package list
       run: sudo apt update
     - name: Install gs
       run: sudo apt install ghostscript
     - name: Configure node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
-        node-version: '20'
+        node-version: '22'
         cache: 'npm'
     - name: Clean install node package
       run: npm ci
     - name: Build node package
       run: npm run build --if-present
     - name: Run node package tests
       run: npm test
-    - name: Deploy to gh-pages
-      uses: JamesIves/github-pages-deploy-action@v4.2.5
+    - name: Upload artifact
+      id: upload-artifact
+      uses: actions/upload-pages-artifact@v3
       with:
-        branch: gh-pages
-        folder: dist
+        name: 'site'
+        path: 'dist'
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+    - name: Deploy to Github Pages
+      uses: actions/deploy-pages@v4
+      with:
+        artifact_name: 'site'

INSTALL.md

@@ -3,16 +3,18 @@
 ## Intro
 Reveal-skel is a forkable template for a presentation based on the [Reveal.js](http://lab.hakim.se/reveal-js/) HTML framework.
 
-[Travis-CI config](.travis.yml)
+The Github Actions workflow in [build.yml](.github/workflows/build.yml) 
 runs a [Node.js project](package.json), 
 calling [Grunt tasks](Gruntfile.coffee) to
 build [the presentation](template/index.html) as a website and
-deploy it on Github Pages via the `gh-pages` branch.
+deploy it on Github Pages.
 
 ## Usage
 * **Fork** the [reveal-skel](https://github.com/sermons/reveal-skel) project
   + Or in your own git repo, run `git remote add upstream https://github.com/sermons/reveal-skel`
-* Setup a **Github token** for Travis [(see below)](#github-token-for-travis)
++ In the Github settings for your forked repository, under 'Pages', set the 'Source' to 'Github Actions'.
+  + This allows the [deploy-pages](https://github.com/actions/deploy-pages) action to deploy directly to Github Pages,
+    without using a `gh-pages` branch.
 * **Edit** [package.json](package.json):
   + Package name, git repo, CNAME
   + Change `sample.md` to `slides.md`
@@ -25,38 +27,6 @@ deploy it on Github Pages via the `gh-pages` branch.
 * Static **assets** (CSS, JS, images, etc) go in [`static`](static)
   + Grunt will copy this dir as-is to the root of the deployed site
 
-## Github token for Travis
-+ **Connect** [Travis](https://travis-ci.com) to your Github account, if you haven't already
-+ On Github, create an access token: *Settings* → *Developer Settings* → *Personal access tokens* → **Generate new token**
-  + *Token description*: e.g., "Travis push to gh-pages"
-  + *Select scopes*: check "**repo**"
-  + Press the **Generate token** button at the bottom
-+ Copy and **save** the token outside the repo:
-  + `echo "github_key=...MY_GITHUB_TOKEN..." > ~/.travis-key.conf`
-+ [Install](https://github.com/travis-ci/travis.rb#installation) the Travis **gem**
-  + See note in the [travis-key script](travis-key) for details
-+ Run `./travis-key` to [securely store the token in Travis](https://docs.travis-ci.com/user/encrypting-files/):
-+ Commit, **push**, and check the [build log](https://travis-ci.com/) for errors
-
-## Bot user for Travis deploy
-If you don't want Travis to have full write-access 
-to all your repos, you may want to create a 
-**special user** just for pushing to the `gh-pages`
-branch.  This is what I do:
-
-+ Create a new Github **user** (a 'bot')
-+ In the bot account, create an **access token** as above
-  + **Save** the token out-of-repo in `~/.travis-key.conf`
-+ In your main account, add the bot as a **collaborator** on your repo:
-  + "*Settings*" → "*Collaborators & teams*" → "*Collaborators*"
-  + Give the bot **Write** access so it can push
-  + Or: [add the bot to an organization](https://developer.github.com/guides/managing-deploy-keys/#machine-users)
-+ **Prevent** the bot from pushing to master:
-  + "*Settings*" → "*Branches*" → "*Protected branches*" → "*master*"
-  + Check "*Protect this branch*" and "*Restrict who can push to this branch*"
-  + Now the bot can **only** push to gh-pages
-+ Run the **script** `./travis-key` in each repo
-
 ## Multiplex (remote-control)
 Don't use the default multiplex socket ID in the template, or your presentation
 can be controlled by anyone with the corresponding secret