3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-13 22:47:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

workflow: Deprecating save-state fix

Browse source
This commit is contained in:
lumapu 2022-11-08 23:12:10 +01:00
parent 07b66635f3
commit 42e652c83a
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/compile_development.yml vendored
View file

@ -52,7 +52,7 @@ jobs:
- name: Rename Binary files - name: Rename Binary files
id: rename-binary-files id: rename-binary-files
working-directory: tools/esp8266/scripts working-directory: tools/esp8266/scripts
run: python getVersion.py run: python getVersion.py >> $GITHUB_OUTPUT
- name: Set Version - name: Set Version
uses: cschleiden/replace-tokens@v1 uses: cschleiden/replace-tokens@v1
@ -72,7 +72,7 @@ jobs:
name: ${{ steps.rename-binary-files.outputs.name }}_dev_build name: ${{ steps.rename-binary-files.outputs.name }}_dev_build
path: | path: |
tools/*/firmware/* tools/*/firmware/*
tools/esp8266/User_Manual.md tools/*/User_Manual.md
tools/*/json/manifest.json tools/*/json/manifest.json
#./${{ steps.rename-binary-files.outputs.name }}.zip #./${{ steps.rename-binary-files.outputs.name }}.zip

10
tools/esp8266/scripts/buildManifest.py
View file

@ -33,16 +33,16 @@ def buildManifest(path, infile, outfile):
esp32 = {} esp32 = {}
esp32["chipFamily"] = "ESP32" esp32["chipFamily"] = "ESP32"
esp32["parts"] = [] esp32["parts"] = []
esp32["parts"].append({"path": "bootloader.bin", "offset": 4096}) esp32["parts"].append({"path": "firmware/bootloader.bin", "offset": 4096})
esp32["parts"].append({"path": "partitions.bin", "offset": 32768}) esp32["parts"].append({"path": "firmware/partitions.bin", "offset": 32768})
esp32["parts"].append({"path": "ota.bin", "offset": 57344}) esp32["parts"].append({"path": "firmware/ota.bin", "offset": 57344})
esp32["parts"].append({"path": version[1] + "_esp32_" + sha + ".bin", "offset": 65536}) esp32["parts"].append({"path": "firmware/" + version[1] + "_esp32_" + sha + ".bin", "offset": 65536})
data["builds"].append(esp32) data["builds"].append(esp32)
esp8266 = {} esp8266 = {}
esp8266["chipFamily"] = "ESP8266" esp8266["chipFamily"] = "ESP8266"
esp8266["parts"] = [] esp8266["parts"] = []
esp8266["parts"].append({"path": version[1] + "_esp8266_" + sha + ".bin", "offset": 0}) esp8266["parts"].append({"path": "firmware/" + version[1] + "_esp8266_" + sha + ".bin", "offset": 0})
data["builds"].append(esp8266) data["builds"].append(esp8266)
jsonString = json.dumps(data, indent=2) jsonString = json.dumps(data, indent=2)

9
tools/esp8266/scripts/getVersion.py
View file

@ -35,7 +35,14 @@ def readVersion(path, infile):
dst = path + "firmware/" + versionout dst = path + "firmware/" + versionout
os.rename(src, dst) os.rename(src, dst)
print("::set-output name=name::" + versionnumber[:-1] ) # other ESP32 bin files
src = path + ".pio/build/esp32-wroom32-release/"
dst = path + "firmware/"
os.rename(src + "bootloader.bin", dst + "bootloader.bin")
os.rename(src + "partitions.bin", dst + "partitions.bin")
#print("::set-output name=name::" + versionnumber[:-1] )
print("name=" + versionnumber[:-1] )
readVersion("../", "defines.h") readVersion("../", "defines.h")