Skip to content

Commit

Permalink
Bring workflow up to date with main
Browse files Browse the repository at this point in the history
  • Loading branch information
sea-bass committed Nov 17, 2024
1 parent 86030f8 commit 7a05897
Showing 1 changed file with 11 additions and 17 deletions.
28 changes: 11 additions & 17 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@ permissions:
jobs:
htmlproofer:
runs-on: ubuntu-latest
container:
image: moveit/moveit2:humble-source
steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
with:
python-version: '3.8'
cache: 'pip'

- name: Install Python dependencies
shell: bash
run: |
Expand All @@ -43,7 +40,7 @@ jobs:
- name: Run htmlproofer.sh
shell: bash
run: |
source /opt/ros/rolling/setup.bash
source /opt/ros/humble/setup.bash
source /root/ws_moveit/install/setup.bash
source .venv/bin/activate
./htmlproofer.sh
Expand All @@ -63,8 +60,6 @@ jobs:
image: ${{ matrix.container }}
steps:
- uses: actions/checkout@v4
with:
ref: 'main'

- name: Install Python dependencies
shell: bash
Expand All @@ -90,7 +85,7 @@ jobs:
run: tar cvzf artifact.tar.gz --directory=build/html .

- name: Upload HTML Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: '${{ matrix.branch }}_html_artifacts'
path: artifact.tar.gz
Expand All @@ -102,9 +97,8 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: 'main'

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
Expand All @@ -123,7 +117,7 @@ jobs:

# TODO (peterdavidfagan): don't hardcode branches for downloads
- name: Download Rolling Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: main_html_artifacts
path: .
Expand All @@ -135,7 +129,7 @@ jobs:
rm artifact.tar.gz
- name: Download Humble Artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: humble_html_artifacts
path: .
Expand All @@ -157,13 +151,13 @@ jobs:
cp -rf python_api/ build/html/main/doc/api/ # restore artifact html
- name: Upload pages artifact
uses: actions/upload-pages-artifact@v2
if: github.repository_owner == 'ros-planning'
uses: actions/upload-pages-artifact@v3
if: github.repository_owner == 'moveit'
with:
path: build/html

deploy:
if: github.repository_owner == 'ros-planning' && github.ref == 'refs/heads/humble'
if: github.repository_owner == 'moveit' && github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: collate_site_artifacts
environment:
Expand All @@ -172,4 +166,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4

0 comments on commit 7a05897

Please sign in to comment.