diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-10 01:46:51 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-10 01:46:51 +0300 |
| commit | c1e5fdb056b6cb414b45e0a637c3f5780e790f99 (patch) | |
| tree | 7e72728e662fece7b9493bdaf7530af74a4c607f | |
| parent | bump jekyll-theme (diff) | |
| download | blog-c1e5fdb056b6cb414b45e0a637c3f5780e790f99.tar.gz blog-c1e5fdb056b6cb414b45e0a637c3f5780e790f99.zip | |
workflows/jekyll: merge jobs, Bundler caching
| -rw-r--r-- | .ci/Gemfile | 2 | ||||
| -rw-r--r-- | .github/workflows/jekyll.yml | 49 | ||||
| -rw-r--r-- | _config.yml | 1 |
3 files changed, 12 insertions, 40 deletions
diff --git a/.ci/Gemfile b/.ci/Gemfile new file mode 100644 index 0000000..053c27d --- /dev/null +++ b/.ci/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'github-pages' diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml index bff469d..cdd44b3 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -6,12 +6,18 @@ on: workflow_dispatch: jobs: - bundler: + build: runs-on: ubuntu-18.04 strategy: matrix: ruby-version: [2.5, 2.6] - name: 'Bundler / ${{ matrix.ruby-version }}' + version: [Gemfile, latest] + include: + - {version: Gemfile, gemfile: Gemfile} + - {version: latest, gemfile: .ci/Gemfile} + name: 'Build / ${{ matrix.ruby-version }} / ${{ matrix.version }}' + env: + BUNDLE_GEMFILE: '${{ matrix.gemfile }}' steps: - name: Checkout uses: actions/checkout@v2 @@ -19,46 +25,9 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby-version }}' - - name: Install dependencies - run: bundle install --jobs=3 --retry=3 + bundler-cache: true - name: jekyll build run: bundle exec jekyll build --config _config.yml,_config_dev.yml --drafts - - github_pages: - runs-on: ubuntu-18.04 - strategy: - matrix: - ruby-version: [2.5, 2.6] - name: 'github-pages / ${{ matrix.ruby-version }}' - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '${{ matrix.ruby-version }}' - - name: Install dependencies - run: | - rm -f -- Gemfile Gemfile.lock - gem install github-pages - - name: jekyll build - run: jekyll build - - verify: - runs-on: ubuntu-18.04 - strategy: - matrix: - ruby-version: [2.5, 2.6] - name: 'Verify / ${{ matrix.ruby-version }}' - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '${{ matrix.ruby-version }}' - - name: Install dependencies - run: bundle install --jobs=3 --retry=3 - name: Check integrity run: | nohup bundle exec jekyll serve --config _config.yml,_config_dev.yml --drafts & diff --git a/_config.yml b/_config.yml index fca05c1..c3aa0cb 100644 --- a/_config.yml +++ b/_config.yml @@ -5,6 +5,7 @@ exclude: - Gemfile - Gemfile.lock - README.md + - vendor/ collections: notes: |