Skip to content

Commit 0813961

Browse files
author
Ben Kutil
committed
Merge pull request #16 from benkutil/tasks/ci
🔀 merge continuous integration
2 parents 35d458e + a8b837d commit 0813961

15 files changed

Lines changed: 66 additions & 11 deletions

File tree

.travis.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
language: ruby
2+
sudo: false
3+
cache:
4+
bundler: true
5+
directories:
6+
- node_modules
7+
env:
8+
global:
9+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
10+
- secure: g9QLZyMW8898EIjme/2YgQW78iH48n3DHZWJv7V8RCjOdA0p9VePMYGitO31PWpiASO3tYGD26EB5PpnG7eRKcP771Ae4gX7MrrefQEDtecryY9YVsMn/uhDQ+29so4F50LQ+7ffUgJbkHCJdh/Pqwhz6plK9hzqq4AAHnBsPa56urnu8Wa7T2lAJNdErHn20ySaX5NT/CZvWN7c+SfJT0h/EVk1lzeNIinyS+3K52sIc1k2t5iLVlq3X2qOjuXQKOYDedd9g9CSGPJ2dAzk2W7msfb3QCM6Ms9QznqbNYxbvZtwLD24yhydrBR93BAkpV3oypeQkhJy3qH/RLV0A6xTsIbtS492gP6P9WDWuqiIN5LFYdKyrnRz2Np3qjHKiX6nejxJ5nUOrEFD1Mxrkp3KWF0IOtR+s7J8qLdJTPDRm0eL73Bzowhfh3dZfu3gVVu6Ul+kf2VWDCYlquCdnnojfRwWwAoNhTNugk8iJ25oxRuiOQfvI9uxv+ms267uVICB8hrYiJvMgy+x7o79z4o7PsNO6NIHcrzubdNoNCH5IWfog/pcxkwiL4rH0J4M1c2s2kdev0sEJmwYQS/9LpWdGyAhG3N3zAPkQ5rnX9bHLFHmWMsW/np39CN5FoYbknQCbTxlWqY3mK+zMNOq5SCfZ+C7BR9h5IeRudgBidY=
11+
- secure: QIOU8S8s7jrUWrcElECC1et6qLUS+DxCkDdTBeX+EcHJbEZULu0GFrDEF7sLGXkl1pDiNQMHTIAYhYONFythKv46kKgNirT8PU6ElTecWCYTKrq7T/hS0+kzSW/WzffY+M/C8Fbu3e0IaJs6dBT4U8h97UiCVrPZ0aaTM0ObgxoSBTAz035J+SHYwbcaCZ2+m8jIPoFNl4JJx0Tr7cdKwrUaBg0+vtGgvRhPNPY/k0Cf1WlYGSrsXAEhK7h68rCx3QN8rRRuk4ADlLq8AMPaOZzV2SOc3+LGgWWPCWJnLcA96aFGBrlbrQsw/bnnaLGhJSgyVyheDyq8w/Jkp+MvGVNMO1tr2arRqPoOD9Uwv+Aa5fKH9Ndmv9ANvVz42ibMo8KPTq2IckIgZPovz1tNbfBRzgh0ls29qfVoNaaK82rJfcc151TA01rMUDwhH4R/K/z1xDBJ8nknuSsTF5MuuYVyMRDqvOsRoY8DTUY3KPVYht67kyhQLQlBV/Ra/0CGxpoGtWw/RUiipD35Vbbq+2KVjazKI/CNtV8nFWyFdLVW1GL0/mgwTxsw3jP1GZ+PcpA8vVLnKcHfEM7nuKZjVg1CsCYi34yNVpuYx5xdOf9Wijrv2IM8qHVS4NtZJU8Lagp7buKqn3VIni1jwG33yddt9CIMWxcCchMR3sEFP8g=
12+
- secure: g6E1FFjc6qEe61imAoULC7UItBaTQzHrFn+3FiYTcLHJTKGGsf1fQ6aWWL2tDaxFYZRBgVXfpqQXXgt4PWL7lfTeLpwi40rnv+6HBuvjr0hdTISU6PmNZG7PUZ8BPuN5sC7xq9RQZIsJxbroeL/g4vLtguEVJ4MP9Gq0aOedvNmx2cx/jwROt8RFV0gqT5VJE66vfCcacoIVZo2K6CK3yZJeJW01Cpq7w/lio3jOv8IuJK0V298VVTK5QsqyHH0o0ZfFIPe3caL8i5R7JHxEKKnGAYVtyfM+JE6bds2AFXIP2POu0CerCBWepMgpi/9OgJm2Jw3RjxRy0ADkD8/vzs/hwbTqaC6MhNAnk+RUvaGuSfLRjmyXX8USzlQhabYNzaR2l9/F3jJDCtJiClGzoY8aeV3uPdLrYQf7/5nbcetg+frHlv0LCVnevEVW+QNSUlH3qxLN3h4OrR3TePVOuiyscd4YKgGiwUtT2RdwURokTiY4jI9fjIN3xOLM/aQzHC+EnfAiur4e7jXO7n4wnsWZ1Mm4AqyStSrftxafFV7xnxLbqC0o6O/f7rgZDmjsDFMrfq3zm6JnzaiMQRU0xJGvFHV+JFhds0bCT7BNvsSvIsAlFm3YSgGpMVbFPLGvomJLpxR8S4j3kDyKNfd43aCYzFYM6/JLP0SjZtO2/gg=
13+
before_install:
14+
- openssl aes-256-cbc -K $encrypted_00d3eca46daa_key -iv $encrypted_00d3eca46daa_iv
15+
-in config/travis/travis_rsa.enc -out ~/.ssh/id_rsa -d
16+
- git config --global user.name "${GIT_NAME}"
17+
- git config --global user.email "${GIT_EMAIL}"
18+
install:
19+
- bundle install
20+
- npm install
21+
before_script:
22+
- git clone https://${GH_TOKEN}@github.com/benkutil/benkutil.github.io.git --branch master --single-branch dist/
23+
- gulp build
24+
script:
25+
- npm test
26+
- htmlproof ./dist
27+
after_success:
28+
- eval "$(ssh-agent)"
29+
- chmod 600 ~/.ssh/id_rsa
30+
- ssh-add
31+
- cd dist
32+
- git add .
33+
- git commit -m ":shipit: Production Build from ${TRAVIS_COMMIT}"
34+
- git push origin HEAD:master
35+
- cd ../
36+
- bundle exec cap production deploy

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
source 'https://rubygems.org'
22

33
gem "capistrano"
4-
gem 'capistrano-withrsync'
5-
gem 'github_changelog_generator'
4+
gem "html-proofer"
65
gem "jekyll"
76
gem "redcarpet"
7+
gem "travis"
8+
gem 'github_changelog_generator'
89

910

1011
group :jekyll_plugins do

config/gulp/build.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module.exports = ( gulp, $, config ) => {
2-
gulp.task( 'build', [ 'clean', 'html' ] );
2+
gulp.task( 'build', ( done ) => {
3+
$.runSequence( 'clean', 'html', 'copy-prod' );
4+
} );
35
}

config/gulp/clean.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = ( gulp, $, config ) => {
2-
gulp.task('clean', $.del.bind(null, ['tmp/**', '!tmp', '!tmp/media', 'dist']));
2+
gulp.task('clean', $.del.bind(null, ['tmp/**/*.*', '!tmp', '!tmp/media/**', 'dist/*', '!dist/.git/**']));
33
}

config/gulp/copy-prod.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = ( gulp, $, config ) => {
2+
gulp.task( 'copy-prod', () => {
3+
4+
return gulp.src([
5+
'tmp/**/*.*',
6+
'!tmp/**/*.html'
7+
], {
8+
dot: true
9+
}).pipe(gulp.dest('dist'));
10+
11+
} );
12+
}

config/gulp/html.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module.exports = ( gulp, $, config ) => {
33
return gulp.src('tmp/**/*.html')
44
.pipe($.useref({searchPath: ['tmp', 'source', '.']}))
55
.pipe($.if('*.js', $.uglify()))
6-
.pipe($.if('*.css', $.cssnano()))
6+
// .pipe($.if('*.css', $.cssnano()))
77
.pipe($.if('*.html', $.htmlmin({collapseWhitespace: true})))
88
.pipe(gulp.dest('dist'));
99
} );

config/jekyll/_config-prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
environment: production
2+
# url: https://benkutil.com

config/jekyll/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ markdown: redcarpet
2121
gems: [jekyll-picture-tag]
2222

2323
picture:
24-
source: ../shared/media
24+
source: media
2525
output: media/generated
2626
markup: picture
2727
presets:

config/travis/travis_rsa.enc

3.17 KB
Binary file not shown.

gulpfile.babel.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020

2121
// § Imports, Plugins
2222
import gulp from 'gulp';
23+
import browserSync from 'browser-sync';
2324
import cp from 'child_process';
2425
import critical from 'critical';
2526
import del from 'del';
26-
import browserSync from 'browser-sync';
2727
import gulpLoadPlugins from 'gulp-load-plugins';
28+
import runSequence from 'run-sequence';
2829

2930

3031
// §§ Configs
@@ -48,6 +49,7 @@ $.cp = cp;
4849
$.critical = critical;
4950
$.del = del;
5051
$.reload = browserSync.reload;
52+
$.runSequence = runSequence;
5153

5254

5355
// §§ Auto Load Subtasks

0 commit comments

Comments
 (0)