Skip to content

Commit

Permalink
Merge branch 'main' into sphinx
Browse files Browse the repository at this point in the history
  • Loading branch information
dennisbrookner authored Sep 11, 2023
2 parents 3508c07 + 6d2ea05 commit b39f2f7
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 12 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: Build
run-name: Build by ${{ github.actor }}
on: [push]
on:
pull_request:
branches:
- main
push:
branches:
- main
workflow_dispatch:

jobs:
build:
runs-on: ${{ matrix.os }}
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Documentation

on:
push:
branches:
Expand Down Expand Up @@ -33,26 +34,22 @@ jobs:
with:
miniconda-version: "latest"
channels: conda-forge, defaults
auto-activate-base: true
activate-environment: ""

- name: Install DIALS environment and more
run: |
conda install -n base conda-libmamba-solver
conda config --set solver libmamba
conda install -c conda-forge -y dials
conda install -n base -c conda-forge -y dials
conda info
conda list
python -m pip install --upgrade pip
pip install -e ".[docs]"
$CONDA/bin/pip install -e ".[docs]"
cd docs
conda list
export SPHINXBUILD="$CONDA/bin/sphinx-build"
make clean
make html
# - name: Install pip dependencies
# run: |

# - name: Build documentation
# run: |

- name: Commit documentation changes to gh-pages
run: |
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: Build
run-name: Build by ${{ github.actor }}
on: [push]
on:
pull_request:
branches:
- main
push:
branches:
- main
workflow_dispatch:

jobs:
build:
runs-on: ${{ matrix.os }}
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: Format
run-name: Code formatting by ${{ github.actor }}
on: [push]
on:
pull_request:
branches:
- main
push:
branches:
- main
workflow_dispatch:

jobs:
format:
runs-on: ${{ matrix.os }}
Expand Down

0 comments on commit b39f2f7

Please sign in to comment.