From e554231bb956f876e9b3fa85d13bb1ea0ac8a318 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Thu, 21 Dec 2023 16:43:21 +0100 Subject: [PATCH 1/4] add requirements.txt --- .github/workflows/documentation.yml | 9 +++------ ethercat_driver_ros2/requirements.txt | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 ethercat_driver_ros2/requirements.txt diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index bef8db81..b4f85bc7 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -24,12 +24,9 @@ jobs: - name: Install dependencies run: | sudo apt-get update -qq - sudo apt-get install -y -qq doxygen graphviz plantuml - pip install sphinx-rtd-theme - pip install sphinxcontrib-plantuml - pip install sphinx-mdinclude - pip install breathe - pip install exhale + sudo apt-get install -y -qq python3-sphinx doxygen graphviz plantuml + cd ./ethercat_driver_ros2/ + pip install -r requirements.txt - name: Build doxygen run: | cd ./ethercat_driver_ros2/doxygen/ diff --git a/ethercat_driver_ros2/requirements.txt b/ethercat_driver_ros2/requirements.txt new file mode 100644 index 00000000..79d7b440 --- /dev/null +++ b/ethercat_driver_ros2/requirements.txt @@ -0,0 +1,5 @@ +sphinx-rtd-theme +sphinxcontrib-plantuml +sphinx-mdinclude +breathe +exhale \ No newline at end of file From 37478f95be7e7876e5d01f4a2ee75be16e0c9a35 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Thu, 21 Dec 2023 16:46:15 +0100 Subject: [PATCH 2/4] trigger Doc CI on PR (main only) --- .github/workflows/documentation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b4f85bc7..4d74a58d 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -5,6 +5,8 @@ on: # Triggers the workflow on push or pull request events but only for the master branch push: branches: [ main ] + pull_request: + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 48f68cfceea930a6bea78709efcd4a57fa54cda9 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Thu, 21 Dec 2023 16:47:53 +0100 Subject: [PATCH 3/4] Revert "trigger Doc CI on PR (main only)" This reverts commit 37478f95be7e7876e5d01f4a2ee75be16e0c9a35. --- .github/workflows/documentation.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 4d74a58d..b4f85bc7 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -5,8 +5,6 @@ on: # Triggers the workflow on push or pull request events but only for the master branch push: branches: [ main ] - pull_request: - branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 7f9035b60ef425885526f76874b6f58f4fc2ddd5 Mon Sep 17 00:00:00 2001 From: Thibault Poignonec Date: Thu, 21 Dec 2023 17:28:20 +0100 Subject: [PATCH 4/4] fix end-of-file --- ethercat_driver_ros2/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethercat_driver_ros2/requirements.txt b/ethercat_driver_ros2/requirements.txt index 79d7b440..4998107b 100644 --- a/ethercat_driver_ros2/requirements.txt +++ b/ethercat_driver_ros2/requirements.txt @@ -2,4 +2,4 @@ sphinx-rtd-theme sphinxcontrib-plantuml sphinx-mdinclude breathe -exhale \ No newline at end of file +exhale