Skip to content

[Docs] Fix on the documentation preview deploy CI #9109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/docs_build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: Documentation Build and Deploy CI

on:
push:
branches:
- master
- release/*
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
pull_request:
paths:
- 'docs/**'
Expand All @@ -9,7 +16,7 @@ on:
jobs:

build-docs:
name: Build Documentation
name: Build ESP-Docs
runs-on: ubuntu-22.04
defaults:
run:
Expand All @@ -35,3 +42,4 @@ jobs:
with:
name: docs
path: docs

19 changes: 11 additions & 8 deletions .github/workflows/docs_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Documentation Build and Deploy Production CI
name: Documentation Build and Production Deploy CI

on:
push:
Expand All @@ -11,27 +11,28 @@ on:
jobs:

deploy-prod-docs:
name: Deploy Documentation Production
name: Deploy Documentation on Production
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Deploy Preview
- name: Deploy Documentation
env:
# Deploy to production server
DOCS_BUILD_DIR: "${CI_PROJECT_DIR}/docs/_build/"
# DOCS_BUILD_DIR: "./docs/_build/"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_PROD_SERVER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }}
# Deploy to preview server
run: |
sudo apt update
sudo apt install python3-pip python3-setuptools
Expand All @@ -43,4 +44,6 @@ jobs:
echo "Building the Docs..."
cd ./docs && build-docs -l en
echo "Deploy the Docs..."
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
cd $GITHUB_WORKSPACE/docs
deploy-docs
10 changes: 6 additions & 4 deletions .github/workflows/docs_preview.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Documentation Build and Deploy CI
name: Documentation Build and Preview Deploy CI

on:
push:
Expand All @@ -11,7 +11,7 @@ on:
jobs:

deploy-preview-docs:
name: Deploy Documentation Preview
name: Deploy Documentation
runs-on: ubuntu-22.04
defaults:
run:
Expand All @@ -26,12 +26,12 @@ jobs:
- name: Deploy Preview
env:
# Deploy to preview server
DOCS_BUILD_DIR: "${CI_PROJECT_DIR}/docs/_build/"
# DOCS_BUILD_DIR: "./docs/_build"
DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }}
DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }}
DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }}
DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }}
run: |
sudo apt update
sudo apt install python3-pip python3-setuptools
Expand All @@ -43,4 +43,6 @@ jobs:
echo "Building the Docs..."
cd ./docs && build-docs -l en
echo "Deploy the Docs..."
export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/
cd $GITHUB_WORKSPACE/docs
deploy-docs
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Arduino core for the ESP32, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2

![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![Documentation Status](https://readthedocs.com/projects/espressif-arduino-esp32/badge/?version=latest)](https://docs.espressif.com/projects/arduino-esp32/en/latest/?badge=latest)
[![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml?link=http://https://github.com/espressif/arduino-esp32/blob/master/LIBRARIES_TEST.md)
![Build Status](https://github.com/espressif/arduino-esp32/workflows/ESP32%20Arduino%20CI/badge.svg) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml?link=http://https://github.com/espressif/arduino-esp32/blob/master/LIBRARIES_TEST.md)

### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)

Expand Down
14 changes: 13 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
esp-docs==1.4.*
sphinx-copybutton==0.5.0
sphinx-tabs==3.2.0
sphinx-tabs==3.2.0
sphinxcontrib-actdiag==3.0.0
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-blockdiag==3.0.0
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-nwdiag==2.0.0
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-seqdiag==3.0.0
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-svg2pdfconverter==1.2.0
sphinxcontrib-wavedrom==3.0.4