Skip to content

Commit 86c324d

Browse files
cotes2020cotes2020
committed
Updated the CI config.
1 parent beacbd2 commit 86c324d

3 files changed

Lines changed: 35 additions & 28 deletions

File tree

‎.travis.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
os: linux
2+
dist: bionic
3+
14
language: ruby
2-
rvm: 2.5.3
5+
rvm: 2.6.5
36

47
before_install:
5-
- pyenv global 3.7.1
8+
- pyenv global 3.7.5
69

710
install:
8-
- pip install --upgrade pip
9-
- pip install ruamel.yaml
11+
- pip install -r _scripts/py/requirements.txt
1012
- bundle install --path vendor/bundle --quiet
1113

1214
addons:
@@ -26,15 +28,13 @@ git:
2628
cache:
2729
directories:
2830
- $TRAVIS_BUILD_DIR/vendor/bundle
29-
- $TRAVIS_BUILD_DIR/tmp/.htmlproofer
3031

3132
notifications:
3233
email:
3334
recipients:
34-
- secure: "GdZFhI2fu6MHwHeGkI9AI8NJexfT+cncJKoOTBxrMPywxvfm6HZ1vZTOwLD9mwG4XZUSznruD4NwRiXMBKs/94n8Z2f0QagCp2is/TuQWBVDUn1bowTbx1S7da6I3qTBGyIHvQWySwFgJuK9/uUeHdQF9ojMejESKZWfc6NjlgYie3Us3ax+Lygq6o4x+8+YPqlC/XwEKUUMUpXZT8Yubxg+s1mLwY9zmp2kJwB1snf6u498FPCWtCuQdGc91HEL4McfUfevnkNKttJQFwdE+mFkLoLn1FcXN0WQ8hPVTQvD/5TaCvACuB1oQ4dm4cnnoIRC5iuQntkP2Am7jPLnHLwxHDqB8vLDNxi1phbfGTk89ffY4n5FirF7DiYIn7hDDbDBlE4++9Pv/i7xgLp9+NzAzz25tdcfKZfXujrwE6b/2NbtXer/eWXyi7d6V/qWO6x8m7/IerX2/VrbXyQIgTvIDe2sSAraM77MMIiQ2KS6yhPIfjyCsC1sokFNRqUWut2UkqMFKOmAnSi/jTQY6/t1aOXGHtVRwgjFoyvBTk9F9NElxt3mseK26Mad3yAv5xLqhqHPFZJbVHJ8dP6RQvWwuvMK1uSqobTl+t0qBvvdSbt1/Oc/ubN1T2clObx1faF2luoMFhRtN+H5s7wfEMrO+sJAuSZnAHuDRpDIwCs="
35+
- secure: "fFLqX7uOzFA8RE2AUFlU1mmxMw+rdV6DnODJ/1Gl+3ecNtrv5LeH3c5a4a5ShQqYTrx9BPfD40VRN7UB+lzOdXiWLI9yDGRPPxGG26/WfrKpdQPZilc8zAOEeDnLAJeGZLsUvgmNb3KCXW6S8NPqqh34CfWcTIzjCARhRgO33wcs8X5wP5cugtNqO5Ew/pUcfWcmiuXNX0GNT6l+nL5A7yN+IO5mRHqSRmlfYd5EHhGMTIL4La+Cd1CNv1m4Dl0Ah2cDeJwi5wLnVbqAgunLhAYmDtxIOCVYMTBrP37UiNe/7QeFelyJfODsmMg1mx3WCykbXydC753WVoAlTg6nNoeeI9fmK+/tuLK+sx/KnYfTVGBXQYq39DyV/2o/IfCzEAKImlzFKGD8R13+ddu4B5UML+cby5KBvhTKIGaC5tKoe39z/31UPpy11/EHMCof2BUOzIgu5Hsv4OSNJlw3oRE31oOPn8xP4e7uWR8bRUhAgzN0Cn0ht+UfpemfGAXrp0M3IXQdc9L4azEFqxRhivMTLK/P6INay7IM+DJ30Ht2dWylGw/sxcRTqyNm3YomJQnXIO4xeqTSLulWr80FFHTys3JEDJYrcKvJmpwLFEAOZtwKsZ6ZShrOIA4LE5fgQtakH3ZLJG9a7jVSlMcNIfaSKgjdDQOe6CoRQL7KouA="
3536
on_success: never
3637

3738
env:
3839
global:
39-
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
40-
- secure: "QNAqDoDQ+mF/3DFxKbc7fnYa5+FysJTX9Vs4XneH6iH63MS2lNtHfC7uT/M0/sRJaygK9eAdb+RaIeADE7CAMzqP3qdWx7l2N6qWab/kyK9KujUBsvoTGX6lDQTwC2Z+zlr5uUScHfLOhqHh6dbm6glziy2NB4dn9pVBXQrmBn09Rf9LImRT2u2h8gzmdl19hZ9TsW1/ROOb/1Soc3JElGRPrIxKI7ufHLQZt0UzZkYXGejQJwtstEEkRSmhfkJjlASeaeuyOFBvkWXjL1nKPsElwEKsAR+4II98JKA83YVqa9TJT2YSnXeLEFIhYDVSG6RLAMEU4rrITzRYC/hWKBKje4G0PDEM/cpnytk9Xhq+7oUFRmXCq3ZQgTQgzWhzl1kExC8b96hiWmQ+lVCw+Q2BG6+NloEEuOHOM839CTXfiitjRJ8KYUdLgW6IaruaingySBsbh1Vl+Dhu73QZ5H40KLdIH6woLXWAgtxkjpaL6DTeWDO6xMiwDreBa/2CJRT5R1tiG45CurZ+AkQ+yAAfSOEwGtE29oZl0sWeWMwVTaAClc0IJaG1+h8jxIVuQqHvK3fzd5RdlDtShrfCCVvQD0n29wXrdeNEg90F92kvdtmw8XgKc2P/Cl5uNzvVeTbFF3ZIHYpCVV4LW4Hn8clgYu+WUa/w4pVrBSdQOUw="
40+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

‎_scripts/travis/cibuild.sh‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,15 @@
88

99
if [[ $TRAVIS_PULL_REQUEST = "false" ]]; then # triggered by author
1010

11-
BUILDER=../blog-builder
11+
git clone https://${GH_PAT}@github.com/${GH_USER}/${BUILDER_REPO}.git \
12+
../${BUILDER_REPO} --depth=1 -q
1213

13-
git clone https://${GH_TOKEN}@github.com/cotes2020/blog-builder.git \
14-
$BUILDER --depth=1 -q
15-
16-
cp -r $BUILDER/framework/* .
14+
cp -r ../${BUILDER_REPO}/framework/* .
1715
bash _cibuild.sh
1816

1917
else # triggered by Pull Request
2018

21-
SAFE_DOMAIN="cdn.jsdelivr.net"
22-
23-
python _scripts/py/init_all.py
24-
25-
build_cmd="bundle exec jekyll build"
26-
27-
echo "\$ $build_cmd"
28-
eval $build_cmd
29-
30-
bundle exec htmlproofer _site/ \
31-
--disable-external \
32-
--check-html \
33-
--empty_alt_ignore \
34-
--allow_hash_href \
35-
--url_ignore $SAFE_DOMAIN
19+
bash tools/build.sh
20+
bash tools/test.sh
3621

3722
fi

‎tools/test.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
#
3+
# Using HTML-proofer to test site.
4+
#
5+
# Requirement: https://github.com/gjtorikian/html-proofer
6+
#
7+
# Usage: bash /path/to/test.sh
8+
#
9+
# v2.0
10+
# https://github.com/cotes2020/jekyll-theme-chirpy
11+
# © 2020 Cotes Chung
12+
# MIT Licensed
13+
14+
DEST=_site
15+
URL_IGNORE=cdn.jsdelivr.net
16+
17+
bundle exec htmlproofer $DEST \
18+
--disable-external \
19+
--check-html \
20+
--empty_alt_ignore \
21+
--allow_hash_href \
22+
--url_ignore $URL_IGNORE

0 commit comments

Comments
 (0)