Skip to content

Commit

Permalink
Merge branch 'master' into fix_test_transforms3d_execuction
Browse files Browse the repository at this point in the history
  • Loading branch information
myeatman-bdai committed Nov 15, 2023
2 parents 0d4bc65 + fb1789c commit e57f617
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Global Owners
* @petercorke @jhavl @myeatman-bdai
42 changes: 4 additions & 38 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ name: build
on:
push:
branches: [ master, future ]
# pull_request:
# branches: [ master ]
pull_request:


jobs:
# Run tests on different versions of python
Expand Down Expand Up @@ -66,39 +66,5 @@ jobs:
needs: unittest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[dev,docs]
pip install git+https://github.com/petercorke/sphinx-autorun.git
pip install sympy
sudo apt-get install graphviz
- name: Build docs
run: |
cd docs
make html
# Tell GitHub not to use jekyll to compile the docs
touch build/html/.nojekyll
cd ../
- name: Commit documentation changes
run: |
git clone https://github.com/petercorke/spatialmath-python.git --branch gh-pages --single-branch gh-pages
cp -r docs/build/html/* gh-pages/
cd gh-pages
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add .
git commit -m "Update documentation" -a || true
# The above command will fail if no changes were present, so we ignore
# that.
- name: Push changes
uses: ad-m/github-push-action@master
with:
branch: gh-pages
directory: gh-pages
github_token: ${{ secrets.GITHUB_TOKEN }}
uses: ./.github/workflows/sphinx.yml
if: ${{ github.event_name != 'pull_request' }}
45 changes: 45 additions & 0 deletions .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Sphinx

on:
workflow_call:

jobs:
sphinx:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[dev,docs]
pip install git+https://github.com/petercorke/sphinx-autorun.git
pip install sympy
sudo apt-get install graphviz
- name: Build docs
run: |
cd docs
make html
# Tell GitHub not to use jekyll to compile the docs
touch build/html/.nojekyll
cd ../
- name: Commit documentation changes
run: |
git clone https://github.com/petercorke/spatialmath-python.git --branch gh-pages --single-branch gh-pages
cp -r docs/build/html/* gh-pages/
cd gh-pages
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git add .
git commit -m "Update documentation" -a || true
# The above command will fail if no changes were present, so we ignore
# that.
- name: Push changes
uses: ad-m/github-push-action@master
with:
branch: gh-pages
directory: gh-pages
github_token: ${{ secrets.GITHUB_TOKEN }}

0 comments on commit e57f617

Please sign in to comment.