Compare commits

...

8 commits
main ... bundle

Author SHA1 Message Date
b127315ea9 whatever 2020-08-11 17:08:37 -05:00
7f145e8366 whatever 2020-08-11 17:06:44 -05:00
49fa1fff89 whatever 2020-08-11 17:01:12 -05:00
066ee9c602 whatever 2020-08-11 16:59:50 -05:00
c1888bc249 move site of bundle-install more 2020-08-11 16:55:54 -05:00
662e69e97b move site of bundle-install 2020-08-11 16:54:00 -05:00
3ed7e18d04 appease bundler root check 2020-08-11 16:49:07 -05:00
a8bb43e6d8 Use bundler to get stuff installed 2020-08-11 16:44:05 -05:00
5 changed files with 104 additions and 3 deletions

View file

@ -17,7 +17,7 @@ jobs:
- name: install dependencies - name: install dependencies
run: | run: |
apt-get update apt-get update
apt-get --no-install-recommends -y install admesh git imagemagick jekyll make openscad python3 python3-yaml xauth xvfb apt-get --no-install-recommends -y install admesh git imagemagick ruby-bundler jekyll make openscad python3 python3-yaml xauth xvfb build-essential ruby-dev
- name: checkout - name: checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: build - name: build
@ -25,7 +25,9 @@ jobs:
set -xe set -xe
echo "sourceurl: https://github.com/$GITHUB_REPOSITORY" >> _config.yml echo "sourceurl: https://github.com/$GITHUB_REPOSITORY" >> _config.yml
cat _config.yml cat _config.yml
env JEKYLL_ENV=production xvfb-run make V=2 -O -j$(nproc) jekyll env BUNDLE_SILENCE_ROOT_WARNING=true bundle update --bundler
env BUNDLE_SILENCE_ROOT_WARNING=true bundle install
env BUNDLE_SILENCE_ROOT_WARNING=true JEKYLL_ENV=production bundle exec xvfb-run make V=2 -O -j$(nproc) jekyll
- if: github.event_name == 'push' && github.ref == 'refs/heads/main' - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
name: publish name: publish
run: | run: |

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
.bundle
.jekyll-cache
_site/ _site/
resources/gen resources/gen

10
Gemfile Normal file
View file

@ -0,0 +1,10 @@
# frozen_string_literal: true
source "https://rubygems.org"
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
gem "jekyll"
gem "jekyll-github-metadata"
gem "jekyll-seo-tag"

83
Gemfile.lock Normal file
View file

@ -0,0 +1,83 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.7)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.13.1)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
jekyll (4.1.1)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 1.0)
jekyll-sass-converter (~> 2.0)
jekyll-watch (~> 2.0)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.4.0)
pathutil (~> 0.9)
rouge (~> 3.0)
safe_yaml (~> 1.0)
terminal-table (~> 1.8)
jekyll-github-metadata (2.13.0)
jekyll (>= 3.4, < 5.0)
octokit (~> 4.0, != 4.4.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
multipart-post (2.1.1)
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (4.0.5)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.4)
rouge (3.22.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
unicode-display_width (1.7.0)
PLATFORMS
ruby
DEPENDENCIES
jekyll
jekyll-github-metadata
jekyll-seo-tag
BUNDLED WITH
1.17.3

View file

@ -35,10 +35,14 @@ It can optionally have notes, an scad file, scad generation flags, images, and o
You can refer to a source scad file multiple times with different flags, You can refer to a source scad file multiple times with different flags,
in order to generate related or parametric models. in order to generate related or parametric models.
## One time setup for Jekyll
$ bundle install
## Build assets and render Locally ## Build assets and render Locally
$ make $ make
$ jekyll serve --watch $ bundle exec jekyll serve --watch
## Build locally and push site to github pages ## Build locally and push site to github pages