diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-10 01:28:10 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2021-04-10 01:34:03 +0300 |
| commit | f5dec4b9690193aa0eba8c9705ae01a0238ecf56 (patch) | |
| tree | 3162ed178d6b578fc4557f5466314f45cf9218df | |
| parent | index.html: add links to other pages (diff) | |
| download | jekyll-theme-f5dec4b9690193aa0eba8c9705ae01a0238ecf56.tar.gz jekyll-theme-f5dec4b9690193aa0eba8c9705ae01a0238ecf56.zip | |
workflows/jekyll: merge jobs, Bundler caching
Diffstat (limited to '')
| -rw-r--r-- | .ci/Gemfile | 2 | ||||
| -rw-r--r-- | .github/workflows/jekyll.yml | 37 | ||||
| -rw-r--r-- | _config.yml | 1 |
3 files changed, 16 insertions, 24 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 cd1aa73..4714bd1 100644 --- a/.github/workflows/jekyll.yml +++ b/.github/workflows/jekyll.yml @@ -6,9 +6,17 @@ on: workflow_dispatch: jobs: - bundler: + build: runs-on: ubuntu-18.04 - name: Bundler + strategy: + matrix: + version: [Gemfile, latest] + include: + - {version: Gemfile, gemfile: Gemfile} + - {version: latest, gemfile: .ci/Gemfile} + name: 'Build / ${{ matrix.version }}' + env: + BUNDLE_GEMFILE: '${{ matrix.gemfile }}' steps: - name: Checkout uses: actions/checkout@v2 @@ -16,30 +24,12 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: '2.6' - - name: Install dependencies - run: bundle install --jobs=3 --retry=3 + bundler-cache: true - name: jekyll build run: bundle exec jekyll build --drafts - github_pages: - runs-on: ubuntu-18.04 - name: github-pages - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.6' - - name: Install dependencies - run: | - rm -f -- Gemfile Gemfile.lock - gem install github-pages - - name: jekyll build - run: jekyll build - public: - needs: [github_pages] + needs: [build] runs-on: ubuntu-18.04 name: Publish steps: @@ -49,8 +39,7 @@ jobs: uses: ruby/setup-ruby@v1 with: ruby-version: '2.6' - - name: Install dependencies - run: bundle install --jobs=3 --retry=3 + bundler-cache: true - name: Build run: bundle exec jekyll build --baseurl /jekyll-theme - name: Publish diff --git a/_config.yml b/_config.yml index 0dd7a7c..ff75909 100644 --- a/_config.yml +++ b/_config.yml @@ -5,6 +5,7 @@ exclude: - Gemfile - Gemfile.lock - README.md + - vendor/ defaults: - scope: |