Skip to content

Commit 1a8ce66

Browse files
committed
reorder benchmark and doc generation
1 parent 9f2d7f9 commit 1a8ce66

File tree

1 file changed

+24
-41
lines changed

1 file changed

+24
-41
lines changed

.github/workflows/ci.yml

Lines changed: 24 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@ on:
77
- README.md
88
- .gitignore
99
- LICENSE.md
10+
- 'docs/src/bench/**' # avoid feedback loop since benchmark modifies files in this path
1011
pull_request:
1112
branches:
1213
- main
1314
paths-ignore:
1415
- README.md
1516
- .gitignore
1617
- LICENSE.md
18+
- 'docs/src/bench/**'
1719
env:
1820
JULIA_NUM_THREADS: 2
1921
jobs:
@@ -96,25 +98,8 @@ jobs:
9698
#file: lcov.info
9799
token: ${{ secrets.CODECOV_TOKEN }}
98100
fail_ci_if_error: false # or true if you want CI to fail when Codecov fails
99-
docs:
100-
name: Documentation
101-
runs-on: ubuntu-latest
102-
steps:
103-
- uses: actions/checkout@v4
104-
- uses: julia-actions/setup-julia@v2
105-
with:
106-
version: '1.12'
107-
- run: |
108-
julia --project=docs -e '
109-
import Pkg;
110-
Pkg.develop(Pkg.PackageSpec(path=pwd()))
111-
Pkg.instantiate()'
112-
- run: julia --project=docs docs/make.jl #Pkg.add("Documenter"); using Pkg
113-
env:
114-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115-
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
116101
benchmark:
117-
needs: docs # ensures this is run after docs. docs replaces gh-pages branch so this needs to happen after
102+
#needs: docs # ensures this is run after docs. docs replaces gh-pages branch so this needs to happen after
118103
name: Run Julia benchmark
119104
runs-on: ${{ matrix.os }}
120105
strategy:
@@ -138,12 +123,7 @@ jobs:
138123
import Pkg;
139124
Pkg.develop(Pkg.PackageSpec(path=pwd()));
140125
Pkg.instantiate()'
141-
- name: Run benchmark # import Pkg; Pkg.add("BenchmarkTools") # Pkg.develop(PackageSpec(path=pwd()))
142-
# julia --project=benchmark -e '
143-
# using Pkg;
144-
# Pkg.add("BenchmarkTools");
145-
# Pkg.develop(PackageSpec(path=pwd()));
146-
# Pkg.instantiate()'
126+
- name: Run benchmark
147127
run: julia --project=benchmark benchmark/runbenchmarks.jl
148128
- uses: actions/cache@v4
149129
with:
@@ -173,20 +153,23 @@ jobs:
173153
alert-threshold: '200%'
174154
comment-on-alert: true
175155
fail-on-alert: false
176-
#alert-comment-cc-users: '@ktrz,@findmyway'
177-
178-
# - name: Store benchmark result - separate results repo
179-
# uses: benchmark-action/github-action-benchmark@v1
180-
# with:
181-
# name: Julia benchmark result
182-
# tool: 'julia'
183-
# output-file-path: benchmark/output.json
184-
# # Use personal access token instead of GITHUB_TOKEN due to https://github.community/t/github-action-not-triggering-gh-pages-upon-push/16096
185-
# github-token: ${{ secrets.BENCHMARK_ACTION_BOT_TOKEN }}
186-
# auto-push: true
187-
# # Show alert with commit comment on detecting possible performance regression
188-
# alert-threshold: '200%'
189-
# comment-on-alert: true
190-
# fail-on-alert: false
191-
# #alert-comment-cc-users: '@ktrz,@findmyway'
192-
# gh-repository: 'github.com/benchmark-action/github-action-benchmark-results'
156+
gh-pages-branch: main # put in to main so that documenter can build with the data
157+
benchmark-data-dir-path: docs/src/bench
158+
docs:
159+
needs: benchmark # So it can build the page with the results
160+
name: Documentation
161+
runs-on: ubuntu-latest
162+
steps:
163+
- uses: actions/checkout@v4
164+
- uses: julia-actions/setup-julia@v2
165+
with:
166+
version: '1.12'
167+
- run: |
168+
julia --project=docs -e '
169+
import Pkg;
170+
Pkg.develop(Pkg.PackageSpec(path=pwd()))
171+
Pkg.instantiate()'
172+
- run: julia --project=docs docs/make.jl #Pkg.add("Documenter"); using Pkg
173+
env:
174+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
175+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

0 commit comments

Comments
 (0)