diff --git a/.circleci/config.example.yml b/.circleci/config.example.yml new file mode 100644 index 000000000..967ccf64b --- /dev/null +++ b/.circleci/config.example.yml @@ -0,0 +1,59 @@ +# https://discuss.circleci.com/t/circleci-2-1-config-overview/26057 +version: 2.1 + +references: + defaults: &defaults + working_directory: ~/repo + environment: + TZ: "/usr/share/zoneinfo/Asia/Hong_Kong" + TERM: xterm + +jobs: + build: + <<: *defaults + docker: + - image: circleci/ruby:2.6.3-node-browsers + steps: + - checkout + - restore_cache: + keys: + - v1-dependencies-{{ checksum "Gemfile.lock" }} + - v1-dependencies- + - run: + name: update bundler + command: | + echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> "$BASH_ENV" + source $BASH_ENV + gem install bundler + - run: + name: install ruby dependencies + command: bundle install --jobs=4 --retry=3 --path vendor/bundle + - save_cache: + paths: + - ./vendor/bundle + key: v1-dependencies-{{ checksum "Gemfile.lock" }} + - restore_cache: + keys: + - v1-dependencies-{{ checksum "yarn.lock" }} + - v1-dependencies- + - run: + name: install node dependencies + command: sudo npm install -g grunt-cli && yarn install --frozen-lockfile + - save_cache: + paths: + - ./node_modules + key: v1-dependencies-{{ checksum "yarn.lock" }} + - run: + name: generate static files + command: grunt build + - persist_to_workspace: + root: ~/repo + paths: + - Dockerfile + - default.conf + - _site/* + +workflows: + build-deploy: + jobs: + - build diff --git a/.travis.init.yml b/.travis.example.yml similarity index 87% rename from .travis.init.yml rename to .travis.example.yml index eb1d5f60c..19ae8b3ad 100644 --- a/.travis.init.yml +++ b/.travis.example.yml @@ -1,3 +1,4 @@ +# Travis is slow, I recommend use CircleCI for CI process sudo: false language: node_js cache: diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 1d0ab53ff..000000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -sudo: false -language: node_js -cache: - - bundler -node_js: - - "10" - - "12" -before_install: - - rvm use 2.6.3 --install --fuzzy - - echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> "$BASH_ENV" - - source $BASH_ENV - - gem install bundler - - bundle install -matrix: - fast_finish: true -notifications: - email: false - slack: - secure: P/ngpvqinM/t9tdXZO2qHQvq2XCkcerKM+KwNJlQoVHnkl/Z/EtzB1yxiZZ6LGdHp+r3nShBhfW+gJVojU80EObt0iWHbFTkUUMFf6WI6c056937CksQI4atmDBiCJxMAnkd6DCLWfBexVtKDhkc5vX0bYhgoiXEzCYUhFd8pZ4= diff --git a/_app/_posts/note/2014-06-13-welcome.md b/_app/_posts/note/2014-06-13-welcome.md index f59af7746..532b895b0 100644 --- a/_app/_posts/note/2014-06-13-welcome.md +++ b/_app/_posts/note/2014-06-13-welcome.md @@ -19,7 +19,7 @@ Go to the [GitHub](https://github.com/sparanoid/almace-scaffolding) page for dow - A basic, fully configured Jekyll setup with well-defined [Atom feed](https://github.com/sparanoid/almace-scaffolding/blob/master/_app/feed-atom.xml) and [sitemap](https://github.com/sparanoid/almace-scaffolding/blob/master/_app/sitemap.xml) - **Almace Scaffolding** ships a sleek responsive theme [Curtana](https://github.com/amsf/amsf-curtana), a variant of [sparanoid.com](https://sparanoid.com/), looking great on any modern browsers - Every minified page generates only one HTTP request [^1] -- [Tons of configurable settings](https://github.com/sparanoid/almace-scaffolding/blob/master/_config.init.yml) for your posts and site customization +- [Tons of configurable settings](https://github.com/sparanoid/almace-scaffolding/blob/master/_config.example.yml) for your posts and site customization - Service Worker support for lightning fast experience - Built with Grunt.js for easy development - Travis support diff --git a/_config.init.yml b/_config.example.yml similarity index 100% rename from _config.init.yml rename to _config.example.yml diff --git a/s3_website.init.yml b/s3_website.example.yml similarity index 100% rename from s3_website.init.yml rename to s3_website.example.yml