diff options
| author | Dan Allen <dan.j.allen@gmail.com> | 2022-10-27 03:21:51 -0600 |
|---|---|---|
| committer | Dan Allen <dan.j.allen@gmail.com> | 2022-10-27 03:24:15 -0600 |
| commit | 3556ebf4b430f2d3ae4ad586df04b07349bec1d7 (patch) | |
| tree | f989958242f4695b794e1c8568b9a675e3a72125 /.github | |
| parent | b8c5db27ac1d5234e9c9e9510db46a6989e24367 (diff) | |
backport fix for #2363 replace use of AbstractBlock#role= method to ensure compatbility with Asciidoctor 2.0.10
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18dce9ab..d98ffb86 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,9 +45,10 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] ruby: [jruby-9.3.7.0, '2.7', '3.1'] - rouge-version: [~] + asciidoctor-version: [~] asciidoctor-diagram-version: ['~> 2.2'] asciidoctor-kroki-version: [~] + rouge-version: [~] upstream: [~] exclude: # remove 3.1 on ubuntu-latest to mark as primary @@ -60,17 +61,18 @@ jobs: ruby: '3.0' - os: macos-latest ruby: '3.1' - # NOTE: enable once Asciidoctor 2.1.0 is released - #- os: ubuntu-latest - # ruby: '2.7' - # asciidoctor-version: '~> 2.0.0' - os: ubuntu-latest ruby: '2.7' + asciidoctor-version: '2.0.10' rouge-version: '~> 2.0.0' - os: windows-latest ruby: '3.1' asciidoctor-diagram-version: ~ asciidoctor-kroki-version: '0.5.0' + # NOTE: enable once Asciidoctor 2.1.0 is released + #- os: ubuntu-latest + # ruby: '3.1' + # asciidoctor-version: '~> 2.0.0' - os: ubuntu-latest ruby: '3.1' upstream: upstream @@ -123,9 +125,10 @@ jobs: run: | echo 'PRAWN_GMAGICK_VERSION=0.0.9' >> $GITHUB_ENV brew install GraphicsMagick - - name: Set Rouge version - if: matrix.rouge-version - run: echo 'ROUGE_VERSION=${{ matrix.rouge-version }}' >> $GITHUB_ENV + - name: Set Asciidoctor version + if: matrix.asciidoctor-version + run: | + echo 'ASCIIDOCTOR_VERSION=${{ matrix.asciidoctor-version }}' >> $GITHUB_ENV - name: Set Asciidoctor Diagram version if: matrix.asciidoctor-diagram-version run: | @@ -134,6 +137,9 @@ jobs: if: matrix.asciidoctor-kroki-version run: | echo 'ASCIIDOCTOR_KROKI_VERSION=${{ matrix.asciidoctor-kroki-version }}' >> $GITHUB_ENV + - name: Set Rouge version + if: matrix.rouge-version + run: echo 'ROUGE_VERSION=${{ matrix.rouge-version }}' >> $GITHUB_ENV - name: Install dependencies run: bundle --jobs 3 --retry 3 - name: Switch to upstream dependencies |