Auto-merge from CI

Author: madhephaestus

.github/workflows/compileTest.yml

@@ -0,0 +1,31 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Compile Test
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  website-deploy:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7']
+
+    steps:         
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Push
+      run: bash compile.sh

Gemfile

@@ -1,5 +1,7 @@
 source "http://production.cf.rubygems.org/"
 
+ruby '~> 2.7.0'
+
 gem 'nanoc', '~> 3.7.4'
 gem 'rainbow', '~> 2.0.0'
 gem 'rake', '~> 10.4.2'

Gemfile.lock

@@ -71,3 +71,9 @@ DEPENDENCIES
   rainbow (~> 2.0.0)
   rake (~> 10.4.2)
   rspec (~> 3.1.0)
+
+RUBY VERSION
+   ruby 2.7.6p219
+
+BUNDLED WITH
+   2.1.4

Rakefile

@@ -213,7 +213,6 @@ namespace :site do
     # Commit and push to github
     sha = `git log`.match(/[a-z0-9]{40}/)[0]
     Dir.chdir(CONFIG["destination"]) do
-      puts "Pushed updated branch #{DESTINATION_BRANCH} to GitHub Pages"
       puts "My work is done, Will I Dream...?"
     end
   end

Rules

@@ -23,6 +23,7 @@ compile '*' do
   elsif item[:extension] == 'js'
     # don’t filter stylesheets
   elsif item[:extension] == 'md'
+    filter :kramdown
     if item[:layout] != nil
         #puts "[#{Rainbow(item.reference).red}]\t\t layout '#{Rainbow(item[:layout]).yellow}' requested in front matter"
         layout item[:layout]

compile.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e 
+
+bundle install
+
+bundle exec rake site:deploy

deploy.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+set -e 
+
+rm -rf docs
+
 git fetch origin
 
 git log -1
@@ -11,6 +15,7 @@ git config core.mergeoptions --no-edit
 git checkout source   
 
 git update-index --assume-unchanged ./.github/workflows/publish.yml
+
 git merge origin/deploy --strategy-option ours --no-ff --no-edit --allow-unrelated-histories -m "Auto-merge from CI " 
 
 git checkout deploy
@@ -21,18 +26,15 @@ git merge source --strategy-option ours --no-ff --no-edit --allow-unrelated-hist
 
 git pull . source --allow-unrelated-histories
 
-set -e 
-
-bundle install
 
-bundle exec rake site:deploy
+bash compile.sh
 
 set +e
 
 git add --all .
 
 git commit -a -m"Update for deploy"
 
-git push origin deploy 
+git push --force
 
 git checkout source

launch.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
 set -e
-sudo apt install gnupg2
-gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-\curl -sSL https://get.rvm.io | bash -s stable
-~/.rvm/bin/rvm pkg install openssl
-~/.rvm/bin/rvm install 2.7.6 --with-openssl-dir=$HOME/.rvm/usr
+
+FILE=~/.rvm/scripts/rvm
+if [ -f "$FILE" ]; then
+    echo "$FILE exists."
+else 
+    echo "$FILE does not exist."
+    sudo apt install gnupg2
+	gpg2 --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+	\curl -sSL https://get.rvm.io | bash -s stable
+	~/.rvm/bin/rvm pkg install openssl
+	~/.rvm/bin/rvm install 2.7.6 --with-openssl-dir=$HOME/.rvm/usr
+fi
+~/.rvm/bin/rvm install ruby-2.7.6
+source $FILE
 bundle install;
 bundle exec nanoc view & bundle exec guard;