Merge branch 'master' into jeremypoulter/core_partition

Author: jeremypoulter

.github/workflows/build.yaml

@@ -2,6 +2,9 @@
 
 name: Build/Release OpenEVSE
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
     inputs:
@@ -13,10 +16,12 @@ on:
         required: true
         description: The branch/tag for the v2 UI
         default: master
-      
+
   push:
     branches:
       - master
+    tags:
+      - 'v*'
   pull_request:
 
 jobs:
@@ -28,7 +33,7 @@ jobs:
 
       - name: Dump the event
         run: cat $GITHUB_EVENT_PATH
-      
+
       - name: Dump github.ref_name
         run: echo "github.ref_name = '${{ github.ref_name }}'"
 
@@ -54,11 +59,11 @@ jobs:
           - openevse_esp32-poe-iso
           - openevse_esp32-heltec-wifi-lora-v2
         gui:
-          - name: openevse_wifi_gui
+          - name: gui-v1
             repo: OpenEVSE/openevse_wifi_gui
             build_flags: ""
             ref: ${{ inputs.v1_ref }}
-          - name: openevse-gui-v2
+          - name: gui-v2
             repo: KipK/openevse-gui-v2
             build_flags: "-D DISABLE_WIFI_PORTAL -D WEB_SERVER_ROOT_PAGE_INDEX"
             ref: ${{ inputs.v2_ref }}
@@ -68,13 +73,6 @@ jobs:
 
     - uses: actions/checkout@v3
 
-#    - name: Temp checkout latest OpenEVSE lib
-#      uses: actions/checkout@v3
-#      with:
-#        repository: jeremypoulter/OpenEVSE_Lib
-#        ref: openevse_wifi_timer_apis
-#        path: lib/OpenEVSE
-
     - name: Checkout GUI
       uses: actions/checkout@v3
       with:
@@ -137,7 +135,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: build
-    if: github.ref_name == 'master' || github.ref_name == 'build_v2_gui' || github.head_ref == 'build_v2_gui'
+    if: github.ref_name == 'master' || startsWith(github.ref_name, 'v')
 
     steps:
     - name: Download the built assets
@@ -155,11 +153,33 @@ jobs:
         done
 
     - name: Upload assets to latest release
+      if: github.ref_name == 'master'
       uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "${{ github.ref_name == 'master' && 'latest' || 'v2_gui' }}"
+        automatic_release_tag: latest
+        prerelease: true
+        title: Development Build
+        files: |
+          *gui-v1.bin
+
+    - name: Upload assets to the v2 GUI release
+      if: github.ref_name == 'master'
+      uses: "marvinpinto/action-automatic-releases@latest"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: v2_gui
+        prerelease: true
+        title: V2 GUI pre-release
+        files: |
+          *gui-v2.bin
+
+    - name: Upload assets to release
+      if: startsWith(github.ref_name, 'v')
+      uses: "softprops/action-gh-release@v1"
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: true
-        title: "${{ github.ref_name == 'master' && 'Development Build' || 'V2 GUI pre-release' }}"
+        title: "${{ github.ref_name }}"
         files: |
           *.bin

.github/workflows/divert_sim.yaml

@@ -0,0 +1,88 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
+name: Build OpenEVSE divert simulator
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: OpenEVSE_WiFi
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/MicroDebug
+          path: MicroDebug
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/MicroTasks
+          path: MicroTasks
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/StreamSpy
+          path: StreamSpy
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/ConfigJson
+          path: ConfigJson
+
+      - uses: actions/checkout@v3
+        with:
+          repository: bblanchon/ArduinoJson
+          path: ArduinoJson
+          ref: v6.20.1
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/OpenEVSE_Lib
+          path: OpenEVSE_Lib
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/EpoxyDuino
+          path: EpoxyDuino
+
+      - uses: actions/checkout@v3
+        with:
+          repository: JeremyPoulter/ESPAL
+          path: ESPAL
+
+      - uses: ammaraskar/gcc-problem-matcher@master
+
+      - name: Build the simulator
+        run: |
+          cd OpenEVSE_WiFi/divert_sim
+          make -j
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: divert_sim
+          path: OpenEVSE_WiFi/divert_sim/divert_sim
+      
+      - name: run tests
+        run: |
+          cd OpenEVSE_WiFi/divert_sim
+          bash runall.sh
+
+      - name : Upload test results
+        uses: actions/upload-artifact@v3
+        with:
+          name: test_results
+          path: |
+            OpenEVSE_WiFi/divert_sim/output
+            OpenEVSE_WiFi/divert_sim/view.html

.github/workflows/release_validation.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Node JS
         uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: '16'
 
       - name: Install dependencies
         run: |
@@ -51,16 +51,21 @@ jobs:
       ### Check the version number in the code matches the tag number
       - uses: actions/checkout@v3
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
       - name: Retrieve the version number(s)
         run: |
-          TAG_VERSION=$(sed "s/^v//" <<< $GITHUB_REF_NAME)
-          CODE_VERSION=$(grep BUILD_TAG platformio.ini | awk -F= '{print $NF}')
+          TAG_VERSION=$GITHUB_REF_NAME
+          CODE_VERSION=$(python3 scripts/auto_fw_version.py | grep -E 'BUILD_TAG=([^ ]+)' -o | cut -d= -f2)
           echo TAG_VERSION=$TAG_VERSION >> $GITHUB_ENV
           echo CODE_VERSION=$CODE_VERSION >> $GITHUB_ENV
 
-      - name: Check the version numberis semver compliant
+      - name: Check the version number is semver compliant
         run: |
-          if ! [[ $TAG_VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-z]*[0-9]+)?$ ]]; then
+          if ! [[ $TAG_VERSION =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[a-z]*[0-9]+)?$ ]]; then
             echo "ERROR: The version number is not semver compliant"
             exit 1
           fi

.gitignore

@@ -90,3 +90,5 @@ lib/StreamSpy
 lib/MicroTasks
 
 *.bin
+divert_sim/epoxyfsdata
+divert_sim/epoxyeepromdata