Skip to content

Commit 77703e8

Browse files
committed
Merge branch 'main' into c
2 parents c8573b4 + 7b05ec4 commit 77703e8

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

.github/workflows/documentation.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Generate Documentation with YARD
22
on:
33
push:
4-
branches: [main]
54
paths:
65
- .github/workflows/documentation.yml
76
- .yardopts
@@ -10,23 +9,24 @@ on:
109
- lib/**
1110
- README.md
1211
- Gemfile
13-
14-
concurrency:
15-
group: pages
16-
cancel-in-progress: true
12+
pull_request:
13+
paths:
14+
- .github/workflows/documentation.yml
15+
- .yardopts
16+
- docs/**
17+
- lib/**
18+
- README.md
19+
- Gemfile
1720
jobs:
1821

1922
build:
2023
runs-on: ubuntu-latest
21-
timeout-minutes: 2
2224
steps:
2325

2426
- uses: actions/checkout@v4
2527
with:
2628
submodules: recursive
2729

28-
- uses: actions/configure-pages@v4
29-
3030
- uses: ruby/setup-ruby@v1
3131
with:
3232
ruby-version: '3'
@@ -41,11 +41,18 @@ jobs:
4141

4242
deploy:
4343
needs: build
44+
if: github.ref_name == 'main'
4445
environment:
4546
name: github-pages
4647
url: ${{ steps.deploy-pages.outputs.page_url }}
47-
permissions: write-all
48+
concurrency:
49+
group: pages
50+
cancel-in-progress: true
4851
runs-on: ubuntu-latest
52+
permissions: write-all
4953
steps:
54+
55+
- uses: actions/configure-pages@v4
56+
5057
- id: deploy-pages
5158
uses: actions/deploy-pages@v4

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ group :development do
99
gem 'steep', '~> 1.6.0', require: false
1010
end
1111
group :documentation do
12-
gem 'yard', '~> 0.9.0', require: false
13-
gem 'commonmarker', '~> 0.23.10', require: false
12+
gem 'yard', github: 'ParadoxV5/yard', tag: 'commonmarker-1.0_1', require: false
13+
gem 'commonmarker', '~> 1.0.4', require: false
1414
end
1515
group :test do
1616
gem 'rake', '~> 13.1.0'

0 commit comments

Comments
 (0)