Attempt to restore GitHub pages

opal · Nov 9, 2023 · aaf9462 · aaf9462
1 parent 82f601f
commit aaf9462
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 40 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -0,0 +1,27 @@
+name: Build and Deploy GH Pages
+on:
+  push:
+    branches:
+      - source
+      - "*/ci-check"
+jobs:
+  pages:
+    concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2" # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
+        run: bin/build
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: master # The branch the action should deploy to.
+          folder: build # The folder the action should deploy.
diff --git a/.ruby-version b/.ruby-version
diff --git a/Gemfile b/Gemfile
@@ -1,15 +1,13 @@
 source 'https://rubygems.org'
 
-ruby '2.7.5' unless ENV['CLOUDFLARE_PAGES']
-
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}.git" }
 
 gem 'opal', '~> 1.8.0'
 gem 'opal-sprockets'
 gem 'sass'
 gem 'haml', '< 6'
 
-gem 'middleman', '~> 4.3.6'
+gem 'middleman', '~> 4.5.0'
 gem 'middleman-syntax'
 gem 'middleman-blog'
 gem 'rake'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.8.1)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
@@ -15,7 +15,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.2)
-    contracts (0.13.0)
+    contracts (0.17)
     dotenv (2.8.1)
     erubis (2.7.0)
     execjs (2.9.1)
@@ -28,49 +28,51 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     hashie (3.6.0)
-    i18n (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     kramdown (2.4.0)
       rexml
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     memoist (0.16.2)
-    middleman (4.3.11)
+    middleman (4.5.0)
       coffee-script (~> 2.2)
       haml (>= 4.0.5)
       kramdown (>= 2.3.0)
-      middleman-cli (= 4.3.11)
-      middleman-core (= 4.3.11)
+      middleman-cli (= 4.5.0)
+      middleman-core (= 4.5.0)
     middleman-blog (4.0.3)
       addressable (~> 2.3)
       middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-cli (4.3.11)
+    middleman-cli (4.5.0)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.3.11)
-      activesupport (>= 4.2, < 6.0)
-      addressable (~> 2.3)
+    middleman-core (4.5.0)
+      activesupport (>= 6.1, < 7.1)
+      addressable (~> 2.4)
       backports (~> 3.6)
-      bundler
-      contracts (~> 0.13.0)
+      bundler (~> 2.0)
+      contracts (~> 0.13)
       dotenv
       erubis
       execjs (~> 2.0)
       fast_blank
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.9.0)
-      listen (~> 3.0.0)
+      i18n (~> 1.6.0)
+      listen (~> 3.0)
       memoist (~> 0.14)
-      padrino-helpers (~> 0.13.0)
+      padrino-helpers (~> 0.15.0)
       parallel
       rack (>= 1.4.5, < 3)
       sassc (~> 2.0)
       servolux
       tilt (~> 2.0.9)
+      toml
       uglifier (~> 3.0)
+      webrick
     middleman-syntax (3.3.0)
       middleman-core (>= 3.2)
       rouge (~> 3.2)
@@ -87,16 +89,16 @@ GEM
       opal (>= 1.0, < 2.0)
       sprockets (~> 4.0)
       tilt (>= 1.4)
-    padrino-helpers (0.13.3.4)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.3.4)
+    padrino-helpers (0.15.3)
+      i18n (>= 0.6.7, < 2)
+      padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.13.3.4)
-      activesupport (>= 3.1)
+    padrino-support (0.15.3)
     parallel (1.23.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
+    parslet (2.0.0)
     public_suffix (5.0.3)
     puma (6.4.0)
       nio4r (~> 2.0)
@@ -122,10 +124,11 @@ GEM
       rack (>= 2.2.4, < 4)
     temple (0.10.3)
     thor (1.3.0)
-    thread_safe (0.3.6)
     tilt (2.0.11)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    toml (0.3.0)
+      parslet (>= 1.8.0, < 3.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     webrick (1.8.1)
@@ -135,7 +138,7 @@ PLATFORMS
 
 DEPENDENCIES
   haml (< 6)
-  middleman (~> 4.3.6)
+  middleman (~> 4.5.0)
   middleman-blog
   middleman-syntax
   nokogiri
@@ -149,8 +152,5 @@ DEPENDENCIES
   uglifier
   webrick
 
-RUBY VERSION
-   ruby 2.7.5p203
-
 BUNDLED WITH
-   2.3.8
+   2.4.21
diff --git a/bin/build b/bin/build
@@ -17,9 +17,9 @@ system! "bundle exec middleman build --clean --verbose --no-parallel --bail --wa
 puts '~~~> Fetching updated docs...'
 FileUtils.mkpath 'build/docs'
 Dir.chdir 'docs' do
-  system! "git fetch --all --verbose"
+  system! "git fetch --refmap=+refs/heads/*:refs/remotes/origin/* --verbose origin gh-pages"
 end
 
 puts '~~~> Extracting updated docs...'
-system! "git archive --remote ./.git/modules/docs/ origin/gh-pages -o docs.tar"
+system! "git archive --remote ./docs/ origin/gh-pages -o docs.tar"
 system! "tar --verbose --directory build/docs -xf docs.tar"