Skip to content

Commit 6c0fb63

Browse files
jeremypoulterjeremypoulter
committed
Merge branch 'master' into esp32-s3_build
2 parents e82bfe4 + cfb1cbe commit 6c0fb63

File tree

93 files changed

+20524
-16104
lines changed

Some content is hidden

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

93 files changed

+20524
-16104
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 14 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ permissions:
66
contents: write
77

88
on:
9-
workflow_dispatch:
10-
inputs:
11-
v2_ref:
12-
required: true
13-
description: The branch/tag for the v2 UI
14-
default: master
15-
169
push:
1710
branches:
1811
- master
@@ -34,7 +27,7 @@ jobs:
3427
run: echo "github.ref_name = '${{ github.ref_name }}'"
3528

3629
build:
37-
name: Build ${{ matrix.env }} with ${{ matrix.gui.name }}
30+
name: Build ${{ matrix.env }}
3831
runs-on: ubuntu-latest
3932

4033
strategy:
@@ -55,41 +48,34 @@ jobs:
5548
- olimex_esp32-gateway-f_dev
5649
- olimex_esp32-poe-iso
5750
- heltec_esp32-wifi-lora-v2
58-
gui:
59-
- name: gui-v2
60-
repo: OpenEVSE/openevse-gui-v2
61-
build_flags: ""
62-
ref: ${{ inputs.v2_ref }}
51+
- wt32-eth01
52+
- esp32-c3-devkitc-02
53+
- elecrow_esp32_hmi
54+
- elecrow_esp32_hmi_dev
55+
- openevse_wifi_tft_v1
56+
- openevse_wifi_tft_v1_dev
6357

6458
steps:
6559
- uses: ammaraskar/gcc-problem-matcher@master
6660

67-
- uses: actions/checkout@v3
68-
69-
- name: Checkout GUI
70-
uses: actions/checkout@v3
71-
with:
72-
repository: ${{ matrix.gui.repo }}
73-
path: ${{ matrix.gui.name }}
74-
ref: ${{ matrix.gui.ref }}
75-
submodules: recursive
61+
- uses: actions/checkout@v4
7662

7763
- name: Cache pip
78-
uses: actions/cache@v3
64+
uses: actions/cache@v4
7965
with:
8066
path: ~/.cache/pip
8167
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
8268
restore-keys: |
8369
${{ runner.os }}-pip-
8470
8571
- name: Cache PlatformIO
86-
uses: actions/cache@v3
72+
uses: actions/cache@v4
8773
with:
8874
path: ~/.platformio
8975
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
9076

9177
- name: Set up Python
92-
uses: actions/setup-python@v4
78+
uses: actions/setup-python@v5
9379
with:
9480
python-version: '3.x'
9581

@@ -98,29 +84,11 @@ jobs:
9884
python -m pip install --upgrade pip
9985
pip install --upgrade platformio
10086
101-
- name: Set up Node JS
102-
uses: actions/setup-node@v3
103-
with:
104-
node-version: '16'
105-
106-
- name: Install dependencies
107-
run: |
108-
cd ${{ matrix.gui.name }}
109-
npm install
110-
111-
- name: Build GUI
112-
run: |
113-
cd ${{ matrix.gui.name }}
114-
npm run build
115-
11687
- name: Run PlatformIO
11788
run: pio run -e ${{ matrix.env }}
118-
env:
119-
GUI_NAME: ${{ matrix.gui.name }}
120-
PLATFORMIO_BUILD_FLAGS: ${{ matrix.gui.build_flags }}
12189

12290
- name: Upload output to GitHub
123-
uses: actions/upload-artifact@v3
91+
uses: actions/upload-artifact@v4
12492
with:
12593
name: ${{ matrix.env }}.bin
12694
path: .pio/build/${{ matrix.env }}/firmware.bin
@@ -133,7 +101,7 @@ jobs:
133101

134102
steps:
135103
- name: Download the built assets
136-
uses: actions/download-artifact@v3
104+
uses: actions/download-artifact@v4
137105
with:
138106
path: artifacts
139107

@@ -159,7 +127,7 @@ jobs:
159127
160128
- name: Upload assets to release
161129
if: startsWith(github.ref_name, 'v')
162-
uses: "softprops/action-gh-release@v1"
130+
uses: "softprops/action-gh-release@v2"
163131
with:
164132
prerelease: true
165133
name: "${{ github.ref_name }}"

‎.github/workflows/build_gui.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
2+
3+
name: Build OpenEVSE GUI
4+
5+
permissions:
6+
contents: write
7+
pull-requests: write
8+
9+
on:
10+
workflow_dispatch:
11+
12+
pull_request:
13+
paths:
14+
- gui-v2
15+
- gui-tft/*
16+
17+
jobs:
18+
build:
19+
name: Build the static GUI files
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- name: Checkout the repository
24+
uses: actions/checkout@v4
25+
with:
26+
submodules: recursive
27+
ref: ${{ github.head_ref }}
28+
token: ${{ secrets.DEPENDABOT_PAT }}
29+
30+
- name: Cache pip
31+
uses: actions/cache@v4
32+
with:
33+
path: ~/.cache/pip
34+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
35+
restore-keys: |
36+
${{ runner.os }}-pip-
37+
38+
- name: Cache PlatformIO
39+
uses: actions/cache@v4
40+
with:
41+
path: ~/.platformio
42+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
43+
44+
- name: Set up Python
45+
uses: actions/setup-python@v5
46+
with:
47+
python-version: '3.x'
48+
49+
- name: Install PlatformIO
50+
run: |
51+
python -m pip install --upgrade pip
52+
pip install --upgrade platformio
53+
54+
- name: Set up Node JS
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: '20'
58+
59+
- name: Install dependencies
60+
run: |
61+
cd gui-v2
62+
npm install
63+
64+
- name: Build GUI
65+
run: |
66+
cd gui-v2
67+
npm run build
68+
69+
- name: Delete the existing pre-built GUI files
70+
run: |
71+
rm -fr src/lcd_static
72+
rm -f src/web_static/*.h
73+
74+
- name: Run PlatformIO
75+
run:
76+
pio run
77+
78+
- name: Push any changed files
79+
uses: stefanzweifel/git-auto-commit-action@v5
80+
with:
81+
commit_message: "Update of pre-built GUI files"

‎.github/workflows/dependabot.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: PlatformIO Dependabot
2+
3+
on:
4+
workflow_dispatch: # option to manually trigger the workflow
5+
schedule:
6+
# Runs every day at 00:00
7+
- cron: '0 0 * * *'
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
dependabot:
15+
runs-on: ubuntu-latest
16+
name: run PlatformIO Dependabot
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- name: run PlatformIO Dependabot
21+
uses: peterus/platformio_dependabot@v1
22+
with:
23+
github_token: ${{ secrets.DEPENDABOT_PAT }}

‎.github/workflows/divert_sim.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,47 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
with:
2727
path: OpenEVSE_WiFi
2828

29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
with:
3131
repository: JeremyPoulter/MicroDebug
3232
path: MicroDebug
3333

34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
with:
3636
repository: JeremyPoulter/MicroTasks
3737
path: MicroTasks
3838

39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
with:
4141
repository: JeremyPoulter/StreamSpy
4242
path: StreamSpy
4343

44-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4545
with:
4646
repository: JeremyPoulter/ConfigJson
4747
path: ConfigJson
4848

49-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
5050
with:
5151
repository: bblanchon/ArduinoJson
5252
path: ArduinoJson
5353
ref: v6.20.1
5454

55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656
with:
5757
repository: JeremyPoulter/OpenEVSE_Lib
5858
path: OpenEVSE_Lib
5959

60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161
with:
6262
repository: JeremyPoulter/EpoxyDuino
6363
path: EpoxyDuino
6464

65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666
with:
6767
repository: JeremyPoulter/ESPAL
6868
path: ESPAL
@@ -75,13 +75,13 @@ jobs:
7575
make -j
7676
7777
- name: Upload artifacts
78-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7979
with:
8080
name: divert_sim
8181
path: OpenEVSE_WiFi/divert_sim/divert_sim
8282

8383
- name: Set up Python 3.10
84-
uses: actions/setup-python@v4
84+
uses: actions/setup-python@v5
8585
with:
8686
python-version: '3.10'
8787
cache: 'pip' # caching pip dependencies
@@ -96,7 +96,7 @@ jobs:
9696
pytest -v --color=yes --code-highlight yes --junit-xml=output/test_results.xml
9797
9898
- name : Upload test results
99-
uses: actions/upload-artifact@v3
99+
uses: actions/upload-artifact@v4
100100
with:
101101
name: test_results
102102
path: |

‎.github/workflows/openapi_validate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
# Check out the repository
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
# Run Spectral
1919
- uses: stoplightio/spectral-action@latest

‎.github/workflows/release_validation.yaml‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,54 @@ jobs:
1212
name: Pre-built GUI Validation
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
with:
1717
submodules: recursive
1818

1919
### Check the pre-built GUI files are up-to-date
20+
- name: Cache pip
21+
uses: actions/cache@v4
22+
with:
23+
path: ~/.cache/pip
24+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
25+
restore-keys: |
26+
${{ runner.os }}-pip-
27+
28+
- name: Cache PlatformIO
29+
uses: actions/cache@v4
30+
with:
31+
path: ~/.platformio
32+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
33+
34+
- name: Set up Python
35+
uses: actions/setup-python@v5
36+
with:
37+
python-version: '3.x'
38+
39+
- name: Install PlatformIO
40+
run: |
41+
python -m pip install --upgrade pip
42+
pip install --upgrade platformio
2043
2144
- name: Set up Node JS
22-
uses: actions/setup-node@v3
45+
uses: actions/setup-node@v4
2346
with:
24-
node-version: '16'
47+
node-version: '20'
2548

2649
- name: Install dependencies
2750
run: |
28-
cd gui
51+
cd gui-v2
2952
npm install
3053
3154
- name: Build GUI
3255
run: |
33-
cd gui
56+
cd gui-v2
3457
npm run build
3558
59+
- name: Run PlatformIO
60+
run:
61+
pio run
62+
3663
- name: Check the pre-built GUI files are up-to-date
3764
run: |
3865
set +e
@@ -49,10 +76,10 @@ jobs:
4976

5077
steps:
5178
### Check the version number in the code matches the tag number
52-
- uses: actions/checkout@v3
79+
- uses: actions/checkout@v4
5380

5481
- name: Set up Python
55-
uses: actions/setup-python@v4
82+
uses: actions/setup-python@v5
5683
with:
5784
python-version: '3.x'
5885

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ lib/MicroTasks
9292
*.bin
9393
divert_sim/epoxyfsdata
9494
divert_sim/epoxyeepromdata
95+
*.pem

‎BootScreen.png‎

21.6 KB
Loading

‎ChargeScreen.png‎

11.4 KB
Loading

0 commit comments

Comments
 (0)