Skip to content

Commit

Permalink
Stop building Wall Display
Browse files Browse the repository at this point in the history 
We come back to this in the future when we can manage memory for the entire package. Meanwhile, let's keep v4.3.12 as the active one.
  • Loading branch information
@edwardtfn
edwardtfn committed Dec 17, 2024
1 parent ed0db84 commit d156ca6
Show file tree
Hide file tree
Showing 9 changed files with 67 additions and 66 deletions.
117 changes: 59 additions & 58 deletions .github/workflows/validate_esphome.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
...
6 changes: 3 additions & 3 deletions prebuilt/wall-display-esp32/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "wall-display-esp32.ota.bin",
"md5": "59e481823df51396a7f0c2be19ee61c3"
"md5": "391baa1e618d74b8567cd02efe638e69"
},
"parts": [
{
Expand All @@ -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"
}
}
}
Binary file modified prebuilt/wall-display-esp32/wall-display-esp32.factory.bin
View file
Binary file not shown.
Binary file modified prebuilt/wall-display-esp32/wall-display-esp32.ota.bin
View file
Binary file not shown.
Binary file modified prebuilt/wall_display.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/wall_display.bin.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
59e481823df51396a7f0c2be19ee61c3 prebuilt/wall_display.bin
391baa1e618d74b8567cd02efe638e69 prebuilt/wall_display.bin
Binary file modified prebuilt/wall_display.factory.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/wall_display.factory.bin.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2ed9d26c4058c903d00f3ab887cad243 prebuilt/wall_display.factory.bin
7f27de2296979005184c8f14521c923f prebuilt/wall_display.factory.bin
6 changes: 3 additions & 3 deletions prebuilt/wall_display.manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "wall-display-esp32.ota.bin",
"md5": "59e481823df51396a7f0c2be19ee61c3"
"md5": "391baa1e618d74b8567cd02efe638e69"
},
"parts": [
{
Expand All @@ -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"
}
}
}

0 comments on commit d156ca6

Please sign in to comment.