Skip to content

Commit faec75b

Browse files
committed
Updated github workflows.
1 parent 5e09142 commit faec75b

2 files changed

Lines changed: 30 additions & 11 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ jobs:
7474
run: brew install docker
7575
- name: Test with pytest
7676
run: |
77-
python -m pytest
78-
# These now take too long, and macOS and Windows both don't have docker installed
79-
# or installed correctly.
80-
# python -m pytest -m "atlas_xaod_runner or atlas_r22_xaod_runner or cms_aod_runner or cms_miniaod_runner"
77+
python -m pytest --docker
8178
- name: Report coverage with Codecov
8279
if: github.event_name == 'push' && matrix.python-version == 3.9 && matrix.platform == 'ubuntu-latest'
8380
uses: codecov/codecov-action@v3

.github/workflows/uploadDocs.yaml

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,50 @@ jobs:
2020
environment:
2121
name: github-pages
2222
url: ${{ steps.deployment.outputs.page_url }}
23+
2324
runs-on: ubuntu-latest
25+
2426
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
2530
- name: Set up Python
2631
uses: actions/setup-python@v5
2732
with:
2833
python-version: "3.12"
29-
- name: Run Pip
30-
run: pip install "Sphinx>=7.0.1,<9" furo>=2023.5.20 sphinx-copybutton>=0.5.2 myst-parser>=3.0.1 sphinx-code-include>=1.4.0 func-adl-servicex-xaodr22 autodoc-pydantic==2.2.0 sphinx-tabs>=3.4.5 enum-tools[sphinx]>=0.12.0 servicex servicex_analysis_utils sphinx_design
31-
32-
- name: Checkout 15 Minute Docs
33-
uses: actions/checkout@v4
34-
- name: Build 15 Minute Sphinx documentation
34+
35+
- name: Install dependencies
36+
run: |
37+
pip install "Sphinx>=7.0.1,<9" \
38+
"furo>=2023.5.20" \
39+
"sphinx-copybutton>=0.5.2" \
40+
"myst-parser>=3.0.1" \
41+
"sphinx-code-include>=1.4.0" \
42+
"func-adl-servicex-xaodr22" \
43+
"autodoc-pydantic==2.2.0" \
44+
"sphinx-tabs>=3.4.5" \
45+
"enum-tools[sphinx]>=0.12.0" \
46+
servicex \
47+
servicex_analysis_utils \
48+
sphinx_design
49+
50+
- name: Install local package
51+
run: pip install -e .
52+
53+
- name: Build Sphinx documentation
3554
working-directory: ${{ github.workspace }}/docs
3655
run: sphinx-build -b html source build/html
56+
3757
- name: Setup Pages
3858
if: ${{ !env.ACT }}
3959
uses: actions/configure-pages@v5
60+
4061
- name: Upload artifact
4162
if: ${{ !env.ACT }}
4263
uses: actions/upload-pages-artifact@v3
4364
with:
44-
path: 'docs/build'
65+
path: docs/build
66+
4567
- name: Deploy to GitHub Pages
4668
if: ${{ !env.ACT }}
4769
id: deployment

0 commit comments

Comments
 (0)