Skip to content

Commit acfb2eb

Browse files
authored
Merge pull request #407 from EnviroDIY/develop
Develop
2 parents 170cdff + 4fcad08 commit acfb2eb

File tree

175 files changed

+7879
-3022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+7879
-3022
lines changed

.github/workflows/build_documentation.yaml

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,51 @@
1-
name: Build and Publish Documentation
1+
name: Check and Publish Documentation
22

33
on:
4+
# Triggers the workflow on push or pull request events
5+
push:
6+
pull_request:
47
# Trigger when a release is created
58
release:
69
types:
710
- published
811
# Also give a manual trigger
912
workflow_dispatch:
13+
inputs:
14+
publish:
15+
description: 'Publish Documentation to GitHub Pages'
16+
required: false
17+
type: boolean
18+
default: false
19+
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: true
1023

1124
env:
12-
DOXYGEN_VERSION: Release_1_9_2
25+
REBUILD_CACHE_NUMBER: 2
26+
PYTHON_DEPS_ARCHIVE_NUM: 2
27+
DOXYGEN_VERSION: Release_1_9_3
28+
TEX_VERSION: 2019
29+
# ^^ 2019 is the latest TeX live available on apt-get and that's good enough
30+
GRAPHVIZ_VERSION: 2.43.0
1331

1432
jobs:
15-
build:
33+
check_menu_inclusion:
34+
runs-on: ubuntu-latest
35+
if: "!contains(github.event.head_commit.message, 'ci skip')"
36+
37+
steps:
38+
- uses: actions/checkout@v2.4.0
39+
40+
- name: Set up Python
41+
uses: actions/setup-python@v3
42+
43+
- name: check for classes in the menu example
44+
run: |
45+
cd $GITHUB_WORKSPACE/continuous_integration
46+
python check_component_inclusion.py
47+
48+
doc_build:
1649
runs-on: ubuntu-latest
1750
if: "!contains(github.event.head_commit.message, 'ci skip')"
1851

@@ -30,25 +63,24 @@ jobs:
3063
id: cache_python
3164
with:
3265
path: ~/.cache/pip
33-
key: ${{ runner.os }}-doxygen-${{ env.DOXYGEN_VERSION }}
66+
key: ${{ runner.os }}-python-${{ env.REBUILD_CACHE_NUMBER }}-${{ env.PYTHON_DEPS_ARCHIVE_NUM }}
3467

3568
- name: Install Pygments and other m.css Python Requirements
36-
if: steps.cache_python.outputs.cache-hit != 'true'
3769
run: |
3870
python -m pip install --upgrade pip
39-
pip3 install --upgrade --upgrade-strategy jinja2 Pygments beautifulsoup4
40-
41-
- name: Install GraphViz (dot)
42-
run: sudo apt-get -y install graphviz
71+
pip3 install --upgrade --upgrade-strategy only-if-needed jinja2 Pygments beautifulsoup4
4372
44-
- name: Restore Doxygen
73+
- name: Restore Doxygen, Graphviz, and TeX Live
4574
id: cache_doxygen
4675
uses: actions/cache@v3
4776
with:
48-
path: doxygen-src
49-
key: ${{ runner.os }}-doxygen-${{ env.DOXYGEN_VERSION }}
77+
path: |
78+
/usr/lib/x86_64-linux-gnu/texlive
79+
/usr/lib/x86_64-linux-gnu/graphviz
80+
doxygen-src
81+
key: ${{ runner.os }}-doxygen-${{ env.REBUILD_CACHE_NUMBER }}-${{ env.DOXYGEN_VERSION }}-${{ env.TEX_VERSION }}-${{ env.GRAPHVIZ_VERSION }}
5082

51-
- name: Clone and build doxygen
83+
- name: Build and install doxygen and its dependencies
5284
if: steps.cache_doxygen.outputs.cache-hit != 'true'
5385
env:
5486
TRAVIS_BUILD_DIR: ${{ github.workspace }}
@@ -74,6 +106,7 @@ jobs:
74106
sh continuous_integration/generate-documentation.sh
75107
76108
- name: Deploy to github pages
109+
if: "(github.event_name == 'release' && github.event.action == 'published') || (github.event_name == 'workflow_dispatch' && github.event.inputs.publish == 'true')"
77110
uses: peaceiris/actions-gh-pages@v3.8.0
78111
with:
79112
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_examples_arduino_cli.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: Build Examples with Arduino CLI
33
# Triggers the workflow on push or pull request events
44
on: [push, pull_request]
55

6+
concurrency:
7+
group: ${{ github.workflow }}-${{ github.ref }}
8+
cancel-in-progress: true
9+
610
jobs:
711
build:
812
runs-on: ubuntu-latest
@@ -19,6 +23,7 @@ jobs:
1923
examples/DRWI_2G/,
2024
examples/DRWI_DigiLTE/,
2125
examples/DRWI_SIM7080LTE/,
26+
examples/DRWI_Mayfly1/,
2227
examples/double_logger/,
2328
examples/baro_rho_correction/,
2429
examples/data_saving/,

.github/workflows/build_examples_platformio.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Build Examples with PlatformIO
22

33
# Triggers the workflow on push or pull request events
44
on: [push, pull_request]
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
58

69
jobs:
710
build:
@@ -19,6 +22,7 @@ jobs:
1922
examples/DRWI_2G/,
2023
examples/DRWI_DigiLTE/,
2124
examples/DRWI_SIM7080LTE/,
25+
examples/DRWI_Mayfly1/,
2226
examples/double_logger/,
2327
examples/baro_rho_correction/,
2428
examples/data_saving/,

0 commit comments

Comments
 (0)