diff --git a/.github/workflows/compile_development.yml b/.github/workflows/compile_development.yml index 218996f2..2786a553 100644 --- a/.github/workflows/compile_development.yml +++ b/.github/workflows/compile_development.yml @@ -61,9 +61,14 @@ jobs: env: VERSION: ${{ steps.rename-binary-files.outputs.name }} + #run: zip --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip tools/esp8266/.pio/build/out/* tools/esp8266/User_Manual.md - name: Create Artifact - run: zip --junk-paths ${{ steps.rename-binary-files.outputs.name }}.zip tools/esp8266/.pio/build/out/* tools/esp8266/User_Manual.md - uses: actions/upload-artifact@v3 with: name: ${{ steps.rename-binary-files.outputs.name }}_dev_build - path: ./${{ steps.rename-binary-files.outputs.name }}.zip + path: | + tools/esp8266/.pio/*/firmware/* + tools/esp8266/User_Manual.md + + #./${{ steps.rename-binary-files.outputs.name }}.zip + diff --git a/tools/esp8266/scripts/getVersion.py b/tools/esp8266/scripts/getVersion.py index 84b45d92..2541ea1c 100644 --- a/tools/esp8266/scripts/getVersion.py +++ b/tools/esp8266/scripts/getVersion.py @@ -18,21 +18,21 @@ def readVersion(path, infile): version += line[p+13:].rstrip() + "." versionnumber += line[p+13:].rstrip() + "." - os.mkdir(path + ".pio/build/out/") + os.mkdir(path + ".pio/build/firmware/") sha = os.getenv("SHA",default="sha") versionout = version[:-1] + "_esp8266_" + sha + ".bin" src = path + ".pio/build/esp8266-release/firmware.bin" - dst = path + ".pio/build/out/" + versionout + dst = path + ".pio/build/firmware/" + versionout os.rename(src, dst) versionout = version[:-1] + "_esp8266_1m_" + sha + ".bin" src = path + ".pio/build/esp8266-1m-release/firmware.bin" - dst = path + ".pio/build/out/" + versionout + dst = path + ".pio/build/firmware/" + versionout os.rename(src, dst) versionout = version[:-1] + "_esp32_" + sha + ".bin" src = path + ".pio/build/esp32-wroom32-release/firmware.bin" - dst = path + ".pio/build/out/" + versionout + dst = path + ".pio/build/firmware/" + versionout os.rename(src, dst) print("::set-output name=name::" + versionnumber[:-1] )