diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml index f12503e7..7d6fc3d4 100644 --- a/.github/workflows/validate_esphome.yml +++ b/.github/workflows/validate_esphome.yml @@ -473,78 +473,79 @@ jobs: cp ${{ steps.build_nspanel_fw.outputs.name }}/${{ steps.build_nspanel_fw.outputs.name }}.factory.bin prebuilt/nspanel_esphome_prebuilt.factory.bin || true cp ${{ steps.build_nspanel_fw.outputs.name }}/manifest.json prebuilt/nspanel_esphome_prebuilt.manifest.json || true - - name: Build ESPHome Prebuilt Wall Display Firmware - id: build_wall_display_fw - uses: esphome/build-action@main - with: - yaml-file: prebuilt/wall_display.yaml - version: beta - - - name: Update manifest.json - name - uses: jossef/action-set-json-field@v2.2 - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - with: - file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json - field: name - value: Wall Display - - - name: Update manifest.json - version - uses: jossef/action-set-json-field@v2.2 - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - with: - file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json - field: version - value: ${{ steps.extract_version.outputs.version }} - - - name: Update manifest.json - builds.chipFamily - uses: jossef/action-set-json-field@v2.2 - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - with: - file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json - field: builds.chipFamily - value: ESP32 - - - name: Update manifest.json - builds.ota.path - uses: jossef/action-set-json-field@v2.2 - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - with: - file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json - field: builds.ota.path - value: "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/wall_display.bin" - - - name: Update manifest.json - builds.ota.release_url - uses: jossef/action-set-json-field@v2.2 - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - with: - file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json - field: builds.ota.release_url - value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.extract_version.outputs.version }}" - - - name: Move and Rename Firmware File - wall_display - if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' - run: | - mkdir -p prebuilt - cp -R ${{ steps.build_wall_display_fw.outputs.name }}/. prebuilt/${{ steps.build_wall_display_fw.outputs.name }}/ - cp ${{ steps.build_wall_display_fw.outputs.name }}/${{ steps.build_wall_display_fw.outputs.name }}.ota.bin prebuilt/wall_display.bin || true - cp ${{ steps.build_wall_display_fw.outputs.name }}/${{ steps.build_wall_display_fw.outputs.name }}.factory.bin prebuilt/wall_display.factory.bin || true - cp ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json prebuilt/wall_display.manifest.json || true + # - name: Build ESPHome Prebuilt Wall Display Firmware + # id: build_wall_display_fw + # uses: esphome/build-action@main + # with: + # yaml-file: prebuilt/wall_display.yaml + # version: beta + + # - name: Update manifest.json - name + # uses: jossef/action-set-json-field@v2.2 + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # with: + # file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json + # field: name + # value: Wall Display + + # - name: Update manifest.json - version + # uses: jossef/action-set-json-field@v2.2 + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # with: + # file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json + # field: version + # value: ${{ steps.extract_version.outputs.version }} + + # - name: Update manifest.json - builds.chipFamily + # uses: jossef/action-set-json-field@v2.2 + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # with: + # file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json + # field: builds.chipFamily + # value: ESP32 + + # - name: Update manifest.json - builds.ota.path + # uses: jossef/action-set-json-field@v2.2 + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # with: + # file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json + # field: builds.ota.path + # value: "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/wall_display.bin" + + # - name: Update manifest.json - builds.ota.release_url + # uses: jossef/action-set-json-field@v2.2 + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # with: + # file: ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json + # field: builds.ota.release_url + # value: "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v${{ steps.extract_version.outputs.version }}" + + # - name: Move and Rename Firmware File - wall_display + # if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' + # run: | + # mkdir -p prebuilt + # cp -R ${{ steps.build_wall_display_fw.outputs.name }}/. prebuilt/${{ steps.build_wall_display_fw.outputs.name }}/ + # cp ${{ steps.build_wall_display_fw.outputs.name }}/${{ steps.build_wall_display_fw.outputs.name }}.ota.bin prebuilt/wall_display.bin || true + # cp ${{ steps.build_wall_display_fw.outputs.name }}/${{ steps.build_wall_display_fw.outputs.name }}.factory.bin prebuilt/wall_display.factory.bin || true + # cp ${{ steps.build_wall_display_fw.outputs.name }}/manifest.json prebuilt/wall_display.manifest.json || true - name: Generate checksum for Firmware Files if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' run: | md5sum prebuilt/nspanel_esphome_prebuilt.bin > prebuilt/nspanel_esphome_prebuilt.bin.md5 md5sum prebuilt/nspanel_esphome_prebuilt.factory.bin > prebuilt/nspanel_esphome_prebuilt.factory.bin.md5 - md5sum prebuilt/wall_display.bin > prebuilt/wall_display.bin.md5 - md5sum prebuilt/wall_display.factory.bin > prebuilt/wall_display.factory.bin.md5 + # md5sum prebuilt/wall_display.bin > prebuilt/wall_display.bin.md5 + # md5sum prebuilt/wall_display.factory.bin > prebuilt/wall_display.factory.bin.md5 - name: Commit and Push Firmware Files if: (github.ref == 'refs/heads/dev' || github.base_ref == 'dev') && github.event_name != 'pull_request' run: | git config --global user.name 'GitHub Actions' git config --global user.email 'actions@github.com' - git add prebuilt/*.bin prebuilt/*.md5 prebuilt/*.json prebuilt/${{ steps.build_nspanel_fw.outputs.name }}/*.* prebuilt/${{ steps.build_wall_display_fw.outputs.name }}/*.* + git add prebuilt/*.bin prebuilt/*.md5 prebuilt/*.json prebuilt/${{ steps.build_nspanel_fw.outputs.name }}/*.* git commit -m "Pre-built firmware update: ${{ github.run_id }}" git push + # git add prebuilt/*.bin prebuilt/*.md5 prebuilt/*.json prebuilt/${{ steps.build_nspanel_fw.outputs.name }}/*.* prebuilt/${{ steps.build_wall_display_fw.outputs.name }}/*.* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ... diff --git a/prebuilt/wall-display-esp32/manifest.json b/prebuilt/wall-display-esp32/manifest.json index 1d3ffd09..72bac9dd 100644 --- a/prebuilt/wall-display-esp32/manifest.json +++ b/prebuilt/wall-display-esp32/manifest.json @@ -2,7 +2,7 @@ "chipFamily": "ESP32", "ota": { "path": "wall-display-esp32.ota.bin", - "md5": "59e481823df51396a7f0c2be19ee61c3" + "md5": "391baa1e618d74b8567cd02efe638e69" }, "parts": [ { @@ -11,12 +11,12 @@ } ], "name": "Wall Display", - "version": "4.4.0.dev6", + "version": "4.3.12", "builds": { "chipFamily": "ESP32", "ota": { "path": "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/wall_display.bin", - "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.4.0.dev6" + "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.12" } } } \ No newline at end of file diff --git a/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin b/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin index eda90455..187a976d 100644 Binary files a/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin and b/prebuilt/wall-display-esp32/wall-display-esp32.factory.bin differ diff --git a/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin b/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin index 7bbb6dcd..fd8dc4a8 100644 Binary files a/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin and b/prebuilt/wall-display-esp32/wall-display-esp32.ota.bin differ diff --git a/prebuilt/wall_display.bin b/prebuilt/wall_display.bin index 7bbb6dcd..fd8dc4a8 100644 Binary files a/prebuilt/wall_display.bin and b/prebuilt/wall_display.bin differ diff --git a/prebuilt/wall_display.bin.md5 b/prebuilt/wall_display.bin.md5 index d37c4ee9..fdd3ddae 100644 --- a/prebuilt/wall_display.bin.md5 +++ b/prebuilt/wall_display.bin.md5 @@ -1 +1 @@ -59e481823df51396a7f0c2be19ee61c3 prebuilt/wall_display.bin +391baa1e618d74b8567cd02efe638e69 prebuilt/wall_display.bin diff --git a/prebuilt/wall_display.factory.bin b/prebuilt/wall_display.factory.bin index eda90455..187a976d 100644 Binary files a/prebuilt/wall_display.factory.bin and b/prebuilt/wall_display.factory.bin differ diff --git a/prebuilt/wall_display.factory.bin.md5 b/prebuilt/wall_display.factory.bin.md5 index b8534f29..512c733b 100644 --- a/prebuilt/wall_display.factory.bin.md5 +++ b/prebuilt/wall_display.factory.bin.md5 @@ -1 +1 @@ -2ed9d26c4058c903d00f3ab887cad243 prebuilt/wall_display.factory.bin +7f27de2296979005184c8f14521c923f prebuilt/wall_display.factory.bin diff --git a/prebuilt/wall_display.manifest.json b/prebuilt/wall_display.manifest.json index 1d3ffd09..72bac9dd 100644 --- a/prebuilt/wall_display.manifest.json +++ b/prebuilt/wall_display.manifest.json @@ -2,7 +2,7 @@ "chipFamily": "ESP32", "ota": { "path": "wall-display-esp32.ota.bin", - "md5": "59e481823df51396a7f0c2be19ee61c3" + "md5": "391baa1e618d74b8567cd02efe638e69" }, "parts": [ { @@ -11,12 +11,12 @@ } ], "name": "Wall Display", - "version": "4.4.0.dev6", + "version": "4.3.12", "builds": { "chipFamily": "ESP32", "ota": { "path": "https://raw.githubusercontent.com/Blackymas/NSPanel_HA_Blueprint/main/prebuilt/wall_display.bin", - "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.4.0.dev6" + "release_url": "https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.12" } } } \ No newline at end of file