From 88ff0b215dd46874e0351d86e1d30b8877f5feef Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Tue, 15 Jun 2021 20:48:42 +0300 Subject: workflows/jekyll -> workflows/ci --- .github/workflows/ci.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ .github/workflows/jekyll.yml | 51 -------------------------------------------- README.md | 2 +- 3 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/jekyll.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..a8cca56 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,51 @@ +name: Publish + +on: + push: + pull_request: + workflow_dispatch: + +jobs: + build: + strategy: + matrix: + ruby-version: [2.5, 2.6, 2.7] + version: [Gemfile, latest] + include: + - {version: Gemfile, gemfile: Gemfile} + - {version: latest, gemfile: .ci/Gemfile} + runs-on: ubuntu-latest + name: 'Build / ${{ matrix.ruby-version }} / ${{ matrix.version }}' + env: + BUNDLE_GEMFILE: '${{ matrix.gemfile }}' + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '${{ matrix.ruby-version }}' + bundler-cache: true + - name: jekyll build + run: bundle exec jekyll build --drafts + + publish: + needs: [build] + runs-on: ubuntu-latest + name: Publish + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: '2.7' + bundler-cache: true + - name: Build + run: bundle exec jekyll build --baseurl /jekyll-theme + - name: Publish + uses: JamesIves/github-pages-deploy-action@4.1.1 + with: + branch: gh-pages + folder: _site + single-commit: true diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml deleted file mode 100644 index a8cca56..0000000 --- a/.github/workflows/jekyll.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Publish - -on: - push: - pull_request: - workflow_dispatch: - -jobs: - build: - strategy: - matrix: - ruby-version: [2.5, 2.6, 2.7] - version: [Gemfile, latest] - include: - - {version: Gemfile, gemfile: Gemfile} - - {version: latest, gemfile: .ci/Gemfile} - runs-on: ubuntu-latest - name: 'Build / ${{ matrix.ruby-version }} / ${{ matrix.version }}' - env: - BUNDLE_GEMFILE: '${{ matrix.gemfile }}' - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '${{ matrix.ruby-version }}' - bundler-cache: true - - name: jekyll build - run: bundle exec jekyll build --drafts - - publish: - needs: [build] - runs-on: ubuntu-latest - name: Publish - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.7' - bundler-cache: true - - name: Build - run: bundle exec jekyll build --baseurl /jekyll-theme - - name: Publish - uses: JamesIves/github-pages-deploy-action@4.1.1 - with: - branch: gh-pages - folder: _site - single-commit: true diff --git a/README.md b/README.md index 2fc45de..c7cd61f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ jekyll-theme ============ -[![Publish](https://github.com/egor-tensin/jekyll-theme/actions/workflows/jekyll.yml/badge.svg)](https://github.com/egor-tensin/jekyll-theme/actions/workflows/jekyll.yml) +[![CI](https://github.com/egor-tensin/jekyll-theme/actions/workflows/ci.yml/badge.svg)](https://github.com/egor-tensin/jekyll-theme/actions/workflows/ci.yml) My [Jekyll] theme. -- cgit v1.2.3