Skip to content

Commit 3110bdb

Browse files
authored
Merge pull request #156 from scipp/fix_docs_build
Fix docs workflow
2 parents c8e48fa + 8dee351 commit 3110bdb

File tree

5 files changed

+50
-343
lines changed

5 files changed

+50
-343
lines changed

.buildconfig/ci.yml

Lines changed: 0 additions & 302 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ on:
1313
default: ''
1414
required: false
1515
type: string
16+
platform:
17+
default: 'ubuntu-22.04'
18+
type: string
1619
workflow_call:
1720
inputs:
1821
publish:
@@ -22,15 +25,22 @@ on:
2225
default: ''
2326
required: false
2427
type: string
28+
platform:
29+
default: 'ubuntu-22.04'
30+
type: string
31+
32+
defaults:
33+
run:
34+
shell: bash -l {0} # required for conda env
2535

2636
env:
2737
VERSION: ${{ inputs.version }}
2838
JUPYTER_PLATFORM_DIRS: 1
2939

3040
jobs:
3141
docs:
32-
name: Build documentation
33-
runs-on: 'ubuntu-22.04'
42+
name: Documentation
43+
runs-on: ${{ inputs.platform }}
3444

3545
steps:
3646
- uses: actions/checkout@v3
@@ -44,24 +54,21 @@ jobs:
4454
micromamba-version: 1.1.0
4555
environment-file: environment.yml
4656
cache-env: true
47-
extra-specs: |
48-
python=${{ matrix.python-version }}
49-
conda-build
5057

5158
- run: conda develop src
5259
- run: jupyter --paths
53-
- run: python docs/make_docs.py --build-dir=html
60+
- run: python docs/make_docs.py --build-dir=html_${{ inputs.platform }}
5461

5562
- uses: actions/upload-artifact@v3
5663
with:
57-
name: DocumentationHTML
58-
path: html
64+
name: html_${{ inputs.platform }}
65+
path: html_${{ inputs.platform }}
5966

6067
- uses: JamesIves/[email protected]
61-
if: ${{ inputs.publish }} && ${{ contains(matrix.os, 'ubuntu') }}
68+
if: ${{ inputs.publish && contains(inputs.platform, 'ubuntu') }}
6269
with:
6370
branch: gh-pages
64-
folder: html
71+
folder: html_${{ inputs.platform }}
6572
target-folder: ${{ env.target }}
6673
single-commit: true
6774
clean-exclude: release

0 commit comments

Comments
 (0)