From 728490875bb27db2b00602a615baa615ddec7f0c Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 10:38:07 +0000 Subject: [PATCH 01/22] fix: rename custom firmware - remove revision and repo name from firmware naming convention --- ESP/tools/customname.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index bac7428..20237ff 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -105,7 +105,7 @@ def customName(project, version, commit, branch): s = lambda x: x.replace('"', "") s = lambda x: x.replace("'", "") - env.Replace( + """ env.Replace( PROGNAME="%s-%s-%s-%s-%s" % ( s(defines.get("PIO_SRC_NAM")), @@ -114,6 +114,15 @@ def customName(project, version, commit, branch): s(defines.get("PIO_SRC_REV")), s(defines.get("PIO_SRC_BRH")), ) + ) """ + + env.Replace( + PROGNAME="%s-%s-%s" + % ( + str(env["PIOENV"]), + s(defines.get("PIO_SRC_TAG")), + s(defines.get("PIO_SRC_BRH")), + ) ) # detect if there is a forward slash in the PROGNAME and replace it with an underscore From 7a1fd85c1f3030f256144c7ab4d8961ff30bf644 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 10:41:59 +0000 Subject: [PATCH 02/22] chore(major): 1.0.0 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 1.0.0 (2023-03-21) ### ⚠ BREAKING CHANGES * CHANGE * CHANGE ### 🧑‍💻 Code Refactoring * factor out `autoversioning.py` ([6c8664c](https://github.com/lorow/OpenIris/commit/6c8664c42547b06845a54b278d4895f6940cfd2c)) * factor out `autoversioning.py` ([09b622b](https://github.com/lorow/OpenIris/commit/09b622b92352fd6ca9de1f12911ba20e69a66fd3)) * **core-firmwareNaming:** fix firmware naming scheme ([f914778](https://github.com/lorow/OpenIris/commit/f914778d56ca126f99f7cd9572d4c634211fa551)) * prepare for merging binaries ([14cc1da](https://github.com/lorow/OpenIris/commit/14cc1dad621fcf7129474476ad56b7cd67d6c6aa)) ### 📝 Documentation * add warning in ini file ([95fdf81](https://github.com/lorow/OpenIris/commit/95fdf810c850bbe3325b924dee00b5575000a24c)) * raise exception when user adds apostrophy ([e1577b8](https://github.com/lorow/OpenIris/commit/e1577b87593ae0f626697e57df37c41e926a9c98)) ### 🍕 Features * add DELETE method to wifi endpoint ([de3ab8b](https://github.com/lorow/OpenIris/commit/de3ab8b4f53aac624a0340c79e64491c7e595c9e)) * add esp32s3 support ([3eeae18](https://github.com/lorow/OpenIris/commit/3eeae182ee8f85785724aac4177df1ea12c2e407)) * add note about bug for apostrophes ([acad1da](https://github.com/lorow/OpenIris/commit/acad1dafb9c28c07ff53ead0d573f6f7f3729f13)) * add wifi rssi endpoint ([8f2b6db](https://github.com/lorow/OpenIris/commit/8f2b6db65b611b4c82de09e2add5a004426da7ec)) * clean up config for users ([5fbe5a3](https://github.com/lorow/OpenIris/commit/5fbe5a358b8211d155a64e688932c97af722bd64)) * Disable auto-exposure, tweak settings to produce a bit cleaner image, document the options ([#38](https://github.com/lorow/OpenIris/issues/38)) ([85094bc](https://github.com/lorow/OpenIris/commit/85094bc3f75e3d8ce16d0039e8c98df0a2875f60)) * merge binaries ([d8980ae](https://github.com/lorow/OpenIris/commit/d8980ae0d4231c11b1ad5ce168dc5a774a5c8466)) ### 🔁 Continuous Integration * **ci-actions:** add autoamated cleanup stage ([3d243fe](https://github.com/lorow/OpenIris/commit/3d243febe6daa82fc6a9734b00c8eb0ce1a0e447)) * **ci-semver:** add semver release for binaries ([ea85d52](https://github.com/lorow/OpenIris/commit/ea85d524d172ca01eecaa8fdd60331be34c505f0)) * **ci-semver:** add semver release for binaries ([f27c650](https://github.com/lorow/OpenIris/commit/f27c6505fe99599c6fe96973f880b5198074e948)) * **ci-semver:** add semver release for binaries ([4073610](https://github.com/lorow/OpenIris/commit/407361099af4077c0f19965243d6baeb75520bd2)) * **ci-semver:** add semver release for binaries ([9da6e6d](https://github.com/lorow/OpenIris/commit/9da6e6d57c4eb15925fe0831de979639b82edfed)) * **ci-semver:** add semver release for binaries ([cb2c89c](https://github.com/lorow/OpenIris/commit/cb2c89c2f320fe631a3f00154ad39b2326905cd9)) * **ci-semver:** add semver release for binaries ([28b5b5a](https://github.com/lorow/OpenIris/commit/28b5b5aa61632d0a5f49d89303507f569c2d4ecb)) * **ci-semver:** add semver release for binaries ([6dbe055](https://github.com/lorow/OpenIris/commit/6dbe055454a90d6405f02bac74161b2dc9d91d98)) * **ci-semver:** add semver release for binaries ([2142dfa](https://github.com/lorow/OpenIris/commit/2142dfaaffeaf67f3fd162491b88ba819a7cd1fd)) * **ci-semver:** add semver release for binaries ([4df943b](https://github.com/lorow/OpenIris/commit/4df943b2c6eed3c4f4f82025a48042f5f9bb9887)) * **ci-semver:** add semver release for binaries ([443798c](https://github.com/lorow/OpenIris/commit/443798c834dc4baae3e7c1e61fce42822203b4aa)) * **ci-semver:** add semver release for binaries ([c265d5f](https://github.com/lorow/OpenIris/commit/c265d5f45b8debf2d443636668222ccba88e8cba)) * **ci-semver:** add semver release for binaries ([e70d092](https://github.com/lorow/OpenIris/commit/e70d092afa1c8aa3df8c41f60ce33198bb9dd859)) * **ci-semver:** add semver release for binaries ([1e2960f](https://github.com/lorow/OpenIris/commit/1e2960f79318603f5ee5949056650f7cd5d0dff8)) * **ci-binaries:** final touches ([cd8b6b8](https://github.com/lorow/OpenIris/commit/cd8b6b8b8affb7eee97bf932f6cf17e366f7f0b9)) * **ci-actions:** fix cleanup step ([5bf7815](https://github.com/lorow/OpenIris/commit/5bf781548c7d03920f100a71f3a2e54ee61f4161)) * **ci-actions:** fix cleanup ([0f6b299](https://github.com/lorow/OpenIris/commit/0f6b299fc83ab39e51936d454cd5d9c471355b3b)) * **ci-releaserc:** fix formatting for CHANGELOG.md ([6647d2e](https://github.com/lorow/OpenIris/commit/6647d2eeb119b6bb150d3306855c3a1f5800c405)) * **ci-binaries:** fix manifest formatting ([cd9eea6](https://github.com/lorow/OpenIris/commit/cd9eea64cd0fd1519cf6edf079d8d92d621546f6)) * **ci-actions:** fix semver release step ([c8e4bb6](https://github.com/lorow/OpenIris/commit/c8e4bb6fcd7cd7b4a5595848464acd18872a6503)) * **ci-test-docker:** test new docker container ([87bc5b3](https://github.com/lorow/OpenIris/commit/87bc5b3f7f83a8f5cabc71a64016befa466ed166)) * **ci-test-docker:** test new docker container ([b8a40f1](https://github.com/lorow/OpenIris/commit/b8a40f133f9fb75e3d1c9922779c0c846d2545a6)) * **ci-test-docker:** test new docker container ([16eefb8](https://github.com/lorow/OpenIris/commit/16eefb86f4853bd6a0d05051fc5fdd58bfbcd3f8)) * **test-docker-container:** test new docker container ([2463aac](https://github.com/lorow/OpenIris/commit/2463aac8c87d30c0ae90461adc8fdcbe273b0341)) * **ci-binaries:** testing merge ([4dafdbc](https://github.com/lorow/OpenIris/commit/4dafdbc484d3f2a657e22b11fcf58541e2a59bad)) * **ci-binaries:** testing merge ([92c8a65](https://github.com/lorow/OpenIris/commit/92c8a659113274f757abab2f7635229503db8835)) * **ci-binaries:** testing merge ([7a7a4d1](https://github.com/lorow/OpenIris/commit/7a7a4d1cc26294b2ce27d0329862808de1e71219)) * **ci-binaries:** testing merge ([f8de13c](https://github.com/lorow/OpenIris/commit/f8de13c97a1455e60ea4118f9243be2d0d6ffee7)) * **ci-binaries:** testing merge ([c56e5ec](https://github.com/lorow/OpenIris/commit/c56e5ec7c23753af0c8a8914a702ba07db671f42)) * **ci-semver:** testing semver release of bins ([b51c995](https://github.com/lorow/OpenIris/commit/b51c9953ed3358be500daffacec050d0bde110fc)) * **ci-semver:** testing semver release of bins ([89767af](https://github.com/lorow/OpenIris/commit/89767aff92d6d4c4db84daa4d17e665a97b8d231)) * **ci-semver:** testing semver release of bins ([2ad57f2](https://github.com/lorow/OpenIris/commit/2ad57f2ad83dc72de382ef85dfb17fad53878073)) * **ci-semver:** testing semver release of bins ([c16f7f1](https://github.com/lorow/OpenIris/commit/c16f7f111296c9fd3300eb5c59da4cf2403ecb94)) * **ci-semver:** update path for github release assets ([3248ded](https://github.com/lorow/OpenIris/commit/3248ded09de3317a232a03ffe42d0579ee7f0e57)) ### 🐛 Bug Fixes * remove OTA builds ([8b29a47](https://github.com/lorow/OpenIris/commit/8b29a47504a533d0728d350c419abf0ab781b4f8)) * add s3 env to cleanup step ([78e5cbf](https://github.com/lorow/OpenIris/commit/78e5cbfd8fb3f25ba13dce2dbc3206d10944d5f9)) * bug in customname ([fea596e](https://github.com/lorow/OpenIris/commit/fea596e529b0f93ee40791ae507d8f5415acbee7)) * bug in MDNS handler ([1ca7d1f](https://github.com/lorow/OpenIris/commit/1ca7d1f48cfbf6fe636072e23852d7b51e58dd23)) * bug in MDNS handler ([4af73d0](https://github.com/lorow/OpenIris/commit/4af73d037741d7ed180e4f156dd08df8c495c620)) * cleanup main ini file ([6ba704f](https://github.com/lorow/OpenIris/commit/6ba704f1f80290f7639f376057d3a824c683e61c)) * duplication of wifi network config ([651b7b6](https://github.com/lorow/OpenIris/commit/651b7b62bad2e995d6cc51edaa49712692f3598c)) * fix compiler error if not git repo ([1704459](https://github.com/lorow/OpenIris/commit/17044593aba94eb69965b21925f40b2ac66f004b)) * fix compiler error if not git repo ([3ca047f](https://github.com/lorow/OpenIris/commit/3ca047f07dac2195970f834771ebc4a47f811b78)) * fix current OTA stack ([c96e3f7](https://github.com/lorow/OpenIris/commit/c96e3f7108a8f776d0251f3fa2823205fa078ce3)) * fix pinout for s3 module ([c0d090d](https://github.com/lorow/OpenIris/commit/c0d090de906dbcd3534ca956b77173bb7b7e4ce8)) * remove common environment ([acb5e44](https://github.com/lorow/OpenIris/commit/acb5e44c03e3272e05e003e21b7ffc67be3b4c7c)) * remove ota env from cleanup step ([fafd35d](https://github.com/lorow/OpenIris/commit/fafd35d19e8b7e9028ca3f09bdb9689c4ab1a165)) * remove unused libs ([1405ab9](https://github.com/lorow/OpenIris/commit/1405ab9d9e1ecbaba5619bc5aaf0bf475781d3a1)) * rename custom firmware ([7284908](https://github.com/lorow/OpenIris/commit/728490875bb27db2b00602a615baa615ddec7f0c)) --- CHANGELOG.md | 89 ++++++++++++++++++++++++++++++++++++++++++++ ESP/lib/library.json | 2 +- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3247e49..a9c5746 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,95 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## 1.0.0 (2023-03-21) + + +### ⚠ BREAKING CHANGES + +* CHANGE +* CHANGE + +### 🧑‍💻 Code Refactoring + +* factor out `autoversioning.py` ([6c8664c](https://github.com/lorow/OpenIris/commit/6c8664c42547b06845a54b278d4895f6940cfd2c)) +* factor out `autoversioning.py` ([09b622b](https://github.com/lorow/OpenIris/commit/09b622b92352fd6ca9de1f12911ba20e69a66fd3)) +* **core-firmwareNaming:** fix firmware naming scheme ([f914778](https://github.com/lorow/OpenIris/commit/f914778d56ca126f99f7cd9572d4c634211fa551)) +* prepare for merging binaries ([14cc1da](https://github.com/lorow/OpenIris/commit/14cc1dad621fcf7129474476ad56b7cd67d6c6aa)) + + +### 📝 Documentation + +* add warning in ini file ([95fdf81](https://github.com/lorow/OpenIris/commit/95fdf810c850bbe3325b924dee00b5575000a24c)) +* raise exception when user adds apostrophy ([e1577b8](https://github.com/lorow/OpenIris/commit/e1577b87593ae0f626697e57df37c41e926a9c98)) + + +### 🍕 Features + +* add DELETE method to wifi endpoint ([de3ab8b](https://github.com/lorow/OpenIris/commit/de3ab8b4f53aac624a0340c79e64491c7e595c9e)) +* add esp32s3 support ([3eeae18](https://github.com/lorow/OpenIris/commit/3eeae182ee8f85785724aac4177df1ea12c2e407)) +* add note about bug for apostrophes ([acad1da](https://github.com/lorow/OpenIris/commit/acad1dafb9c28c07ff53ead0d573f6f7f3729f13)) +* add wifi rssi endpoint ([8f2b6db](https://github.com/lorow/OpenIris/commit/8f2b6db65b611b4c82de09e2add5a004426da7ec)) +* clean up config for users ([5fbe5a3](https://github.com/lorow/OpenIris/commit/5fbe5a358b8211d155a64e688932c97af722bd64)) +* Disable auto-exposure, tweak settings to produce a bit cleaner image, document the options ([#38](https://github.com/lorow/OpenIris/issues/38)) ([85094bc](https://github.com/lorow/OpenIris/commit/85094bc3f75e3d8ce16d0039e8c98df0a2875f60)) +* merge binaries ([d8980ae](https://github.com/lorow/OpenIris/commit/d8980ae0d4231c11b1ad5ce168dc5a774a5c8466)) + + +### 🔁 Continuous Integration + +* **ci-actions:** add autoamated cleanup stage ([3d243fe](https://github.com/lorow/OpenIris/commit/3d243febe6daa82fc6a9734b00c8eb0ce1a0e447)) +* **ci-semver:** add semver release for binaries ([ea85d52](https://github.com/lorow/OpenIris/commit/ea85d524d172ca01eecaa8fdd60331be34c505f0)) +* **ci-semver:** add semver release for binaries ([f27c650](https://github.com/lorow/OpenIris/commit/f27c6505fe99599c6fe96973f880b5198074e948)) +* **ci-semver:** add semver release for binaries ([4073610](https://github.com/lorow/OpenIris/commit/407361099af4077c0f19965243d6baeb75520bd2)) +* **ci-semver:** add semver release for binaries ([9da6e6d](https://github.com/lorow/OpenIris/commit/9da6e6d57c4eb15925fe0831de979639b82edfed)) +* **ci-semver:** add semver release for binaries ([cb2c89c](https://github.com/lorow/OpenIris/commit/cb2c89c2f320fe631a3f00154ad39b2326905cd9)) +* **ci-semver:** add semver release for binaries ([28b5b5a](https://github.com/lorow/OpenIris/commit/28b5b5aa61632d0a5f49d89303507f569c2d4ecb)) +* **ci-semver:** add semver release for binaries ([6dbe055](https://github.com/lorow/OpenIris/commit/6dbe055454a90d6405f02bac74161b2dc9d91d98)) +* **ci-semver:** add semver release for binaries ([2142dfa](https://github.com/lorow/OpenIris/commit/2142dfaaffeaf67f3fd162491b88ba819a7cd1fd)) +* **ci-semver:** add semver release for binaries ([4df943b](https://github.com/lorow/OpenIris/commit/4df943b2c6eed3c4f4f82025a48042f5f9bb9887)) +* **ci-semver:** add semver release for binaries ([443798c](https://github.com/lorow/OpenIris/commit/443798c834dc4baae3e7c1e61fce42822203b4aa)) +* **ci-semver:** add semver release for binaries ([c265d5f](https://github.com/lorow/OpenIris/commit/c265d5f45b8debf2d443636668222ccba88e8cba)) +* **ci-semver:** add semver release for binaries ([e70d092](https://github.com/lorow/OpenIris/commit/e70d092afa1c8aa3df8c41f60ce33198bb9dd859)) +* **ci-semver:** add semver release for binaries ([1e2960f](https://github.com/lorow/OpenIris/commit/1e2960f79318603f5ee5949056650f7cd5d0dff8)) +* **ci-binaries:** final touches ([cd8b6b8](https://github.com/lorow/OpenIris/commit/cd8b6b8b8affb7eee97bf932f6cf17e366f7f0b9)) +* **ci-actions:** fix cleanup step ([5bf7815](https://github.com/lorow/OpenIris/commit/5bf781548c7d03920f100a71f3a2e54ee61f4161)) +* **ci-actions:** fix cleanup ([0f6b299](https://github.com/lorow/OpenIris/commit/0f6b299fc83ab39e51936d454cd5d9c471355b3b)) +* **ci-releaserc:** fix formatting for CHANGELOG.md ([6647d2e](https://github.com/lorow/OpenIris/commit/6647d2eeb119b6bb150d3306855c3a1f5800c405)) +* **ci-binaries:** fix manifest formatting ([cd9eea6](https://github.com/lorow/OpenIris/commit/cd9eea64cd0fd1519cf6edf079d8d92d621546f6)) +* **ci-actions:** fix semver release step ([c8e4bb6](https://github.com/lorow/OpenIris/commit/c8e4bb6fcd7cd7b4a5595848464acd18872a6503)) +* **ci-test-docker:** test new docker container ([87bc5b3](https://github.com/lorow/OpenIris/commit/87bc5b3f7f83a8f5cabc71a64016befa466ed166)) +* **ci-test-docker:** test new docker container ([b8a40f1](https://github.com/lorow/OpenIris/commit/b8a40f133f9fb75e3d1c9922779c0c846d2545a6)) +* **ci-test-docker:** test new docker container ([16eefb8](https://github.com/lorow/OpenIris/commit/16eefb86f4853bd6a0d05051fc5fdd58bfbcd3f8)) +* **test-docker-container:** test new docker container ([2463aac](https://github.com/lorow/OpenIris/commit/2463aac8c87d30c0ae90461adc8fdcbe273b0341)) +* **ci-binaries:** testing merge ([4dafdbc](https://github.com/lorow/OpenIris/commit/4dafdbc484d3f2a657e22b11fcf58541e2a59bad)) +* **ci-binaries:** testing merge ([92c8a65](https://github.com/lorow/OpenIris/commit/92c8a659113274f757abab2f7635229503db8835)) +* **ci-binaries:** testing merge ([7a7a4d1](https://github.com/lorow/OpenIris/commit/7a7a4d1cc26294b2ce27d0329862808de1e71219)) +* **ci-binaries:** testing merge ([f8de13c](https://github.com/lorow/OpenIris/commit/f8de13c97a1455e60ea4118f9243be2d0d6ffee7)) +* **ci-binaries:** testing merge ([c56e5ec](https://github.com/lorow/OpenIris/commit/c56e5ec7c23753af0c8a8914a702ba07db671f42)) +* **ci-semver:** testing semver release of bins ([b51c995](https://github.com/lorow/OpenIris/commit/b51c9953ed3358be500daffacec050d0bde110fc)) +* **ci-semver:** testing semver release of bins ([89767af](https://github.com/lorow/OpenIris/commit/89767aff92d6d4c4db84daa4d17e665a97b8d231)) +* **ci-semver:** testing semver release of bins ([2ad57f2](https://github.com/lorow/OpenIris/commit/2ad57f2ad83dc72de382ef85dfb17fad53878073)) +* **ci-semver:** testing semver release of bins ([c16f7f1](https://github.com/lorow/OpenIris/commit/c16f7f111296c9fd3300eb5c59da4cf2403ecb94)) +* **ci-semver:** update path for github release assets ([3248ded](https://github.com/lorow/OpenIris/commit/3248ded09de3317a232a03ffe42d0579ee7f0e57)) + + +### 🐛 Bug Fixes + +* remove OTA builds ([8b29a47](https://github.com/lorow/OpenIris/commit/8b29a47504a533d0728d350c419abf0ab781b4f8)) +* add s3 env to cleanup step ([78e5cbf](https://github.com/lorow/OpenIris/commit/78e5cbfd8fb3f25ba13dce2dbc3206d10944d5f9)) +* bug in customname ([fea596e](https://github.com/lorow/OpenIris/commit/fea596e529b0f93ee40791ae507d8f5415acbee7)) +* bug in MDNS handler ([1ca7d1f](https://github.com/lorow/OpenIris/commit/1ca7d1f48cfbf6fe636072e23852d7b51e58dd23)) +* bug in MDNS handler ([4af73d0](https://github.com/lorow/OpenIris/commit/4af73d037741d7ed180e4f156dd08df8c495c620)) +* cleanup main ini file ([6ba704f](https://github.com/lorow/OpenIris/commit/6ba704f1f80290f7639f376057d3a824c683e61c)) +* duplication of wifi network config ([651b7b6](https://github.com/lorow/OpenIris/commit/651b7b62bad2e995d6cc51edaa49712692f3598c)) +* fix compiler error if not git repo ([1704459](https://github.com/lorow/OpenIris/commit/17044593aba94eb69965b21925f40b2ac66f004b)) +* fix compiler error if not git repo ([3ca047f](https://github.com/lorow/OpenIris/commit/3ca047f07dac2195970f834771ebc4a47f811b78)) +* fix current OTA stack ([c96e3f7](https://github.com/lorow/OpenIris/commit/c96e3f7108a8f776d0251f3fa2823205fa078ce3)) +* fix pinout for s3 module ([c0d090d](https://github.com/lorow/OpenIris/commit/c0d090de906dbcd3534ca956b77173bb7b7e4ce8)) +* remove common environment ([acb5e44](https://github.com/lorow/OpenIris/commit/acb5e44c03e3272e05e003e21b7ffc67be3b4c7c)) +* remove ota env from cleanup step ([fafd35d](https://github.com/lorow/OpenIris/commit/fafd35d19e8b7e9028ca3f09bdb9689c4ab1a165)) +* remove unused libs ([1405ab9](https://github.com/lorow/OpenIris/commit/1405ab9d9e1ecbaba5619bc5aaf0bf475781d3a1)) +* rename custom firmware ([7284908](https://github.com/lorow/OpenIris/commit/728490875bb27db2b00602a615baa615ddec7f0c)) + ## [1.10.6](https://github.com/lorow/OpenIris/compare/v1.10.5...v1.10.6) (2023-03-12) diff --git a/ESP/lib/library.json b/ESP/lib/library.json index cf4b146..e00f599 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.10.6", + "version": "1.0.0", "frameworks": "arduino", "platforms": "espressif32" } From f826c17ac836b0bd70423fd88c3a263a11c79a69 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 11:14:53 +0000 Subject: [PATCH 03/22] refactor: intitial release --- ESP/tools/customname.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index 20237ff..a53381e 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -124,6 +124,7 @@ def customName(project, version, commit, branch): s(defines.get("PIO_SRC_BRH")), ) ) + # detect if there is a forward slash in the PROGNAME and replace it with an underscore if "/" in env["PROGNAME"]: From e567a948ea81fbc26f52d068765740f3dc6d2e83 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 11:18:21 +0000 Subject: [PATCH 04/22] chore(patch): 1.0.1 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.1](https://github.com/lorow/OpenIris/compare/v1.0.0...v1.0.1) (2023-03-21) ### 🧑‍💻 Code Refactoring * intitial release ([f826c17](https://github.com/lorow/OpenIris/commit/f826c17ac836b0bd70423fd88c3a263a11c79a69)) --- CHANGELOG.md | 7 +++++++ ESP/lib/library.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c5746..00adc66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.1](https://github.com/lorow/OpenIris/compare/v1.0.0...v1.0.1) (2023-03-21) + + +### 🧑‍💻 Code Refactoring + +* intitial release ([f826c17](https://github.com/lorow/OpenIris/commit/f826c17ac836b0bd70423fd88c3a263a11c79a69)) + ## 1.0.0 (2023-03-21) diff --git a/ESP/lib/library.json b/ESP/lib/library.json index e00f599..e3b4249 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.0", + "version": "1.0.1", "frameworks": "arduino", "platforms": "espressif32" } From 65ffbbd03848c211b186c10f79bddb1a70e4c236 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 12:46:52 +0000 Subject: [PATCH 05/22] fix: release version out of sync --- .github/workflows/build_release_bins.yml | 5 ++ .releaserc | 5 +- ESP/ini/dev_config.ini | 2 + ESP/tools/customname.py | 4 +- repo-tools/scripts/prepareCMD.sh | 106 +++++++++++++++++++++++ 5 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 repo-tools/scripts/prepareCMD.sh diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index c2c68ac..0bcae43 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -84,6 +84,11 @@ jobs: release-openiris: runs-on: ubuntu-latest needs: [build] + strategy: + fail-fast: false + matrix: + target_name: [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] + target_build_type: ["", _release] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.releaserc b/.releaserc index 0e794d9..a972758 100644 --- a/.releaserc +++ b/.releaserc @@ -148,8 +148,8 @@ [ "@semantic-release/exec", { - "prepareCmd": "sed -i 's/\"version\": \"[0-9\\.]*\",/\"version\": \"${nextRelease.version}\",/g' ./ESP/lib/library.json", - "publishCmd": "ls -l" + "prepareCmd": "./repo-tools/scripts/prepareCMD.sh ${nextRelease.version}", + "publishCmd": "echo Publishing ${nextRelease.version}" } ], [ @@ -168,6 +168,7 @@ { "assets": [ "ESP/lib/library.json", + "ESP/ini/dev_config.ini", "LICENSE*", "CHANGELOG.md" ], diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 2c5c862..6f26778 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,6 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 +custom_firmware_version = 0.0.0 monitor_rts = 0 monitor_dtr = 0 monitor_filters = @@ -24,6 +25,7 @@ extra_scripts = pre:tools/customname.py post:tools/createzip.py build_flags = + -DVERSION=${this.custom_firmware_version} -DENABLE_ADHOC=${wifi.enableadhoc} -DADHOC_CHANNEL=${wifi.adhocchannel} -DWIFI_CHANNEL=${wifi.channel} diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index a53381e..4067b2e 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -120,11 +120,11 @@ def customName(project, version, commit, branch): PROGNAME="%s-%s-%s" % ( str(env["PIOENV"]), - s(defines.get("PIO_SRC_TAG")), + env.GetProjectOption("custom_firmware_version"), s(defines.get("PIO_SRC_BRH")), ) ) - + # detect if there is a forward slash in the PROGNAME and replace it with an underscore if "/" in env["PROGNAME"]: diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh new file mode 100644 index 0000000..9deed17 --- /dev/null +++ b/repo-tools/scripts/prepareCMD.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +# create a vairable to hold a passed in argument +# this argument is the next release version +# this is passed in from the .releaserc file + +sudo apt-get install -y jq + +nextReleaseVersion=$1 + +# parse all letters a-z and A-Z and replace with nothing +# this will remove all letters from the version string +# this is to ensure that the version string is a valid semver + +# check if there is a letter in the version string +# if there is a letter, then remove it +# if there is no letter, then do nothing +if [[ $nextReleaseVersion =~ [a-zA-Z] ]]; then + nextReleaseVersion=$(echo $nextReleaseVersion | sed 's/[a-zA-Z]//g') + + # check if there is a dash in the version string + # if there is a dash, then replace it with a dot + # if there is no dash, then do nothing + if [[ $nextReleaseVersion =~ "-" ]]; then + # parse all dashes and replace with dots + # this is to ensure that the version string is a valid semver + nextReleaseVersion=$(echo $nextReleaseVersion | sed 's/-/./g') + + # remove everything after the third dot and the dot itself + # this is to ensure that the version string is a valid semver + nextReleaseVersion=$(echo $nextReleaseVersion | sed 's/\.[0-9]*$//g') + # remove the last dot + nextReleaseVersion=$(echo $nextReleaseVersion | sed 's/\.$//g') + fi +fi + +# print the next release version + +printf "[prepareCMD.sh]: Next version: ${nextReleaseVersion}\n" + +# This script is used to execute the prepareCMD.sh script on the remote host +printf "[prepareCMD.sh]: Executing prepareCMD.sh on remote host \n" + +printf "[prepareCMD.sh]: Updating the version in the library.json file \n" + +# make a temp file +tmp=$(mktemp) + +jq --arg a "$nextReleaseVersion" '.version = $a' ./ESP/lib/library.json > "$tmp" && mv "$tmp" ./ESP/lib/library.json -f + +printf "[prepareCMD.sh]: Done \n" + +printf "[prepareCMD.sh]: Installing the dependencies for the ini file \n" + +pip3 install yq + +export PATH="~/.local/bin:$PATH" +source ~/.bashrc + +tmp=$(mktemp) +tomlq -t --arg version "$nextReleaseVersion" '.env.custom_firmware_version |= $version' ./ESP/ini/dev_config.ini > "$tmp" && mv "$tmp" ./ESP/ini/dev_config.ini -f + +printf "[prepareCMD.sh]: Done, continuing with release. \n" + +# mass rename files in the ./build sub folders +printf "[prepareCMD.sh]: Mass renaming files in the ./build sub folders \n" + +#create an array of all the sub folders in the build folder +buildPaths=($(ls ./build)) + +printf "[prepareCMD.sh]: buildPaths: ${buildPaths[@]} \n" + +# loop through all the sub folders in the build folder +for buildPath in "${buildPaths[@]}" +do + # create a variable to hold the path to the sub folder + buildPath="./build/${buildPath}" + + # create a vari able to hold the path to the sub folder's files + buildPathFiles=($(ls ${buildPath})) + + # loop through all the files in the sub folder and rename them to the next release version + for buildPathFile in "${buildPathFiles[@]}" + do + # create a variable to hold the path to the file + buildPathFile="${buildPath}/${buildPathFile}" + + # rename the file to the next release version + # parse out the sub folder name and append it to the next release version + # this is to ensure that the file name is unique + + #create a variable that holds the current directory + currentDir=$(pwd) + + #parse out the parent folder name and store it in a variable + buildPathFileSubFolder=$(basename $(dirname ${buildPathFile})) + + # append the sub folder name to the next release version + nextReleaseVersion="${buildPathFileSubFolder}-v${nextReleaseVersion}-master" + + mv ${buildPathFile} ${buildPath}/${nextReleaseVersion}.zip + done +done + +printf "[prepareCMD.sh]: Done \n" + From 78df34542f9dad483c38b5e042518083f55cb0f8 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 12:51:40 +0000 Subject: [PATCH 06/22] fix: release version out of sync --- .github/workflows/build_release_bins.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index 0bcae43..c2c68ac 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -84,11 +84,6 @@ jobs: release-openiris: runs-on: ubuntu-latest needs: [build] - strategy: - fail-fast: false - matrix: - target_name: [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] - target_build_type: ["", _release] steps: - name: Checkout uses: actions/checkout@v3 From 6cc8985413066592d00a1054ca19629f73af6a39 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 13:05:20 +0000 Subject: [PATCH 07/22] fix: permission denied issue with shell script - add group concurrency - add write permissions --- .github/workflows/build_release_bins.yml | 29 +++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_release_bins.yml b/.github/workflows/build_release_bins.yml index c2c68ac..4e58bb5 100644 --- a/.github/workflows/build_release_bins.yml +++ b/.github/workflows/build_release_bins.yml @@ -1,6 +1,9 @@ name: Build and Release the OpenIris bin files on: + workflow_dispatch: push: + tags: + - "v*" branches: - "master" - "main" @@ -8,14 +11,24 @@ on: branches: - "master" - "main" - workflow_dispatch: + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +permissions: + contents: write + jobs: build: strategy: fail-fast: false matrix: - target_name: [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] - target_build_type: ["", _release] #, _OTA] # OTA is not needed + target_name: + [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] + target_build_type: ["", _release] #, _OTA] # OTA is not needed runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -40,7 +53,7 @@ jobs: # python-version: "3.x" #- name: Install PlatformIO with Pip # run: | -# + # # python -m pip install --upgrade pip # pip install distro # pip install --upgrade platformio @@ -109,12 +122,16 @@ jobs: - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: semantic-release + run: | + sudo apt-get install -y jq + chmod +x ./repo-tools/scripts/prepareCMD.sh + semantic-release cleanup: strategy: fail-fast: false matrix: - target_name: [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] + target_name: + [esp32AIThinker, esp32M5Stack, esp32Cam, esp_eye, wrover, wrovers3] target_build_type: ["", _release] name: Cleanup actions needs: From aee0719ee5059aec2568a0a6d1b6913195864e47 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 13:09:10 +0000 Subject: [PATCH 08/22] chore(patch): 1.0.2 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.2](https://github.com/lorow/OpenIris/compare/v1.0.1...v1.0.2) (2023-03-21) ### 🐛 Bug Fixes * permission denied issue with shell script ([6cc8985](https://github.com/lorow/OpenIris/commit/6cc8985413066592d00a1054ca19629f73af6a39)) * release version out of sync ([78df345](https://github.com/lorow/OpenIris/commit/78df34542f9dad483c38b5e042518083f55cb0f8)) * release version out of sync ([65ffbbd](https://github.com/lorow/OpenIris/commit/65ffbbd03848c211b186c10f79bddb1a70e4c236)) --- CHANGELOG.md | 9 +++++++++ ESP/lib/library.json | 46 ++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00adc66..184d248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.2](https://github.com/lorow/OpenIris/compare/v1.0.1...v1.0.2) (2023-03-21) + + +### 🐛 Bug Fixes + +* permission denied issue with shell script ([6cc8985](https://github.com/lorow/OpenIris/commit/6cc8985413066592d00a1054ca19629f73af6a39)) +* release version out of sync ([78df345](https://github.com/lorow/OpenIris/commit/78df34542f9dad483c38b5e042518083f55cb0f8)) +* release version out of sync ([65ffbbd](https://github.com/lorow/OpenIris/commit/65ffbbd03848c211b186c10f79bddb1a70e4c236)) + ## [1.0.1](https://github.com/lorow/OpenIris/compare/v1.0.0...v1.0.1) (2023-03-21) diff --git a/ESP/lib/library.json b/ESP/lib/library.json index e3b4249..b7234ed 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -1,26 +1,26 @@ { - "name": "OpenIris", - "keywords": "esp32S, openiris, openiris-esp32s, webcam, streaming server", - "description": "openiris library", - "authors": [ - { - "name": "lorow", - "url": "https://github.com/lorow" - }, - { - "name": "ZanzyTHEbar", - "url": "https://github.com/ZanzyTHEbar" - } - ], - "repository": { - "type": "git", - "url": "https://github.com/lorow/OpenIris.git" + "name": "OpenIris", + "keywords": "esp32S, openiris, openiris-esp32s, webcam, streaming server", + "description": "openiris library", + "authors": [ + { + "name": "lorow", + "url": "https://github.com/lorow" }, - "export": { - "include": "/lib/src" - }, - "dependencies": {}, - "version": "1.0.1", - "frameworks": "arduino", - "platforms": "espressif32" + { + "name": "ZanzyTHEbar", + "url": "https://github.com/ZanzyTHEbar" + } + ], + "repository": { + "type": "git", + "url": "https://github.com/lorow/OpenIris.git" + }, + "export": { + "include": "/lib/src" + }, + "dependencies": {}, + "version": "1.0.2", + "frameworks": "arduino", + "platforms": "espressif32" } From 6e627fb873b7961633644e06ca18d8081e025e0f Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 13:32:18 +0000 Subject: [PATCH 09/22] fix: trying to fix error in release script - add quotes to dev_config version member - add stripping of quotes to customname.py - removed second for loop from shell script --- ESP/ini/dev_config.ini | 4 ++-- ESP/tools/customname.py | 15 ++++++++++--- repo-tools/scripts/prepareCMD.sh | 36 +++++++++++--------------------- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 6f26778..22799d5 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 0.0.0 +custom_firmware_version="0.0.0" monitor_rts = 0 monitor_dtr = 0 monitor_filters = @@ -25,7 +25,7 @@ extra_scripts = pre:tools/customname.py post:tools/createzip.py build_flags = - -DVERSION=${this.custom_firmware_version} + '-DVERSION=${this.custom_firmware_version}' -DENABLE_ADHOC=${wifi.enableadhoc} -DADHOC_CHANNEL=${wifi.adhocchannel} -DWIFI_CHANNEL=${wifi.channel} diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index 4067b2e..965bc5a 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -116,16 +116,25 @@ def customName(project, version, commit, branch): ) ) """ + firm_version = env.GetProjectOption("custom_firmware_version") + + # strip quotes needed for shell escaping in the firmware version + + if firm_version is None: + firm_version = "0.0.0" + else: + firm_version = firm_version.replace('"', "") + firm_version = firm_version.replace("'", "") + env.Replace( PROGNAME="%s-%s-%s" % ( str(env["PIOENV"]), - env.GetProjectOption("custom_firmware_version"), + firm_version, s(defines.get("PIO_SRC_BRH")), ) ) - # detect if there is a forward slash in the PROGNAME and replace it with an underscore if "/" in env["PROGNAME"]: env.Replace(PROGNAME="%s" % (env["PROGNAME"].replace("/", "-"))) @@ -142,7 +151,7 @@ try: # Dump global construction environment (for debug purpose) # write env.Dump() to a file - #with open("env_dump.txt", "w") as f: + # with open("env_dump.txt", "w") as f: # f.write(env.Dump()) handleGit() diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh index 9deed17..93ae8bf 100644 --- a/repo-tools/scripts/prepareCMD.sh +++ b/repo-tools/scripts/prepareCMD.sh @@ -68,38 +68,26 @@ printf "[prepareCMD.sh]: Mass renaming files in the ./build sub folders \n" #create an array of all the sub folders in the build folder buildPaths=($(ls ./build)) -printf "[prepareCMD.sh]: buildPaths: ${buildPaths[@]} \n" # loop through all the sub folders in the build folder for buildPath in "${buildPaths[@]}" do + printf "[prepareCMD.sh]: Build Path: ${buildPath} \n" # create a variable to hold the path to the sub folder buildPath="./build/${buildPath}" - # create a vari able to hold the path to the sub folder's files + # create a variable to hold the path to the sub folder's files buildPathFiles=($(ls ${buildPath})) - - # loop through all the files in the sub folder and rename them to the next release version - for buildPathFile in "${buildPathFiles[@]}" - do - # create a variable to hold the path to the file - buildPathFile="${buildPath}/${buildPathFile}" - - # rename the file to the next release version - # parse out the sub folder name and append it to the next release version - # this is to ensure that the file name is unique - - #create a variable that holds the current directory - currentDir=$(pwd) - - #parse out the parent folder name and store it in a variable - buildPathFileSubFolder=$(basename $(dirname ${buildPathFile})) - - # append the sub folder name to the next release version - nextReleaseVersion="${buildPathFileSubFolder}-v${nextReleaseVersion}-master" - - mv ${buildPathFile} ${buildPath}/${nextReleaseVersion}.zip - done + #create a variable that holds the current directory + currentDir=$(pwd) + + #parse out the parent folder name and store it in a variable + buildPathFileSubFolder=$(basename $(dirname ${buildPathFiles})) + + # append the sub folder name to the next release version + nextReleaseVersion="${buildPathFileSubFolder}-v${nextReleaseVersion}-master" + + mv ${buildPathFile} ${buildPath}/${nextReleaseVersion}.zip done printf "[prepareCMD.sh]: Done \n" From b639d9a5308781ffbdb2c680ea9a432f65bdf98c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 13:35:50 +0000 Subject: [PATCH 10/22] chore(patch): 1.0.3 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.3](https://github.com/lorow/OpenIris/compare/v1.0.2...v1.0.3) (2023-03-21) ### 🐛 Bug Fixes * trying to fix error in release script ([6e627fb](https://github.com/lorow/OpenIris/commit/6e627fb873b7961633644e06ca18d8081e025e0f)) --- CHANGELOG.md | 7 +++++++ ESP/lib/library.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 184d248..04b92b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.3](https://github.com/lorow/OpenIris/compare/v1.0.2...v1.0.3) (2023-03-21) + + +### 🐛 Bug Fixes + +* trying to fix error in release script ([6e627fb](https://github.com/lorow/OpenIris/commit/6e627fb873b7961633644e06ca18d8081e025e0f)) + ## [1.0.2](https://github.com/lorow/OpenIris/compare/v1.0.1...v1.0.2) (2023-03-21) diff --git a/ESP/lib/library.json b/ESP/lib/library.json index b7234ed..48ec02e 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.2", + "version": "1.0.3", "frameworks": "arduino", "platforms": "espressif32" } From 94682d86f8271da49ff84d45167ab05720fb22eb Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 13:55:40 +0000 Subject: [PATCH 11/22] fix: remove toml parser in favour of sed --- repo-tools/scripts/prepareCMD.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh index 93ae8bf..da7fad9 100644 --- a/repo-tools/scripts/prepareCMD.sh +++ b/repo-tools/scripts/prepareCMD.sh @@ -48,17 +48,17 @@ tmp=$(mktemp) jq --arg a "$nextReleaseVersion" '.version = $a' ./ESP/lib/library.json > "$tmp" && mv "$tmp" ./ESP/lib/library.json -f -printf "[prepareCMD.sh]: Done \n" +printf "[prepareCMD.sh]: Done, moving on to next files \n" -printf "[prepareCMD.sh]: Installing the dependencies for the ini file \n" +sed -i -e "/^\[env\]/,/^\[.*\]/ s|^\(custom_firmware_version[ \t]*=[ \t]*\).*$|\1$nextReleaseVersion|" "./ESP/ini/dev_config.ini" -pip3 install yq - -export PATH="~/.local/bin:$PATH" -source ~/.bashrc - -tmp=$(mktemp) -tomlq -t --arg version "$nextReleaseVersion" '.env.custom_firmware_version |= $version' ./ESP/ini/dev_config.ini > "$tmp" && mv "$tmp" ./ESP/ini/dev_config.ini -f +#pip3 install yq +# +#export PATH="~/.local/bin:$PATH" +#source ~/.bashrc +# +#tmp=$(mktemp) +#tomlq -t --arg version "$nextReleaseVersion" '.env.custom_firmware_version |= $version' ./ESP/ini/dev_config.ini > "$tmp" && mv "$tmp" ./ESP/ini/dev_config.ini -f printf "[prepareCMD.sh]: Done, continuing with release. \n" From 526d9429d93918debf667ef2bcdc828c06e21fc4 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 13:59:28 +0000 Subject: [PATCH 12/22] chore(patch): 1.0.4 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.4](https://github.com/lorow/OpenIris/compare/v1.0.3...v1.0.4) (2023-03-21) ### 🐛 Bug Fixes * remove toml parser in favour of sed ([94682d8](https://github.com/lorow/OpenIris/commit/94682d86f8271da49ff84d45167ab05720fb22eb)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b92b5..0843766 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.4](https://github.com/lorow/OpenIris/compare/v1.0.3...v1.0.4) (2023-03-21) + + +### 🐛 Bug Fixes + +* remove toml parser in favour of sed ([94682d8](https://github.com/lorow/OpenIris/commit/94682d86f8271da49ff84d45167ab05720fb22eb)) + ## [1.0.3](https://github.com/lorow/OpenIris/compare/v1.0.2...v1.0.3) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 22799d5..b6fa883 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version="0.0.0" +custom_firmware_version=1.0.4 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 48ec02e..4e91c71 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.3", + "version": "1.0.4", "frameworks": "arduino", "platforms": "espressif32" } From 2ef8b7428d4a4bdf4c5db86236cb9bed1bcd19b4 Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 14:28:23 +0000 Subject: [PATCH 13/22] fix: prepareCMD rename zip files before release --- ESP/ini/dev_config.ini | 3 +-- ESP/src/main.cpp | 15 ++++++++--- repo-tools/scripts/prepareCMD.sh | 44 +++++--------------------------- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index b6fa883..b4556c1 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version=1.0.4 +custom_firmware_version = 1.0.4 monitor_rts = 0 monitor_dtr = 0 monitor_filters = @@ -25,7 +25,6 @@ extra_scripts = pre:tools/customname.py post:tools/createzip.py build_flags = - '-DVERSION=${this.custom_firmware_version}' -DENABLE_ADHOC=${wifi.enableadhoc} -DADHOC_CHANNEL=${wifi.adhocchannel} -DWIFI_CHANNEL=${wifi.channel} diff --git a/ESP/src/main.cpp b/ESP/src/main.cpp index 93e88db..98048f2 100644 --- a/ESP/src/main.cpp +++ b/ESP/src/main.cpp @@ -24,15 +24,24 @@ ProjectConfig deviceConfig("openiris", MDNS_HOSTNAME); #if ENABLE_OTA OTA ota(&deviceConfig); -#endif // ENABLE_OTA +#endif // ENABLE_OTA LEDManager ledManager(33, &ledStateManager); #ifndef SIM_ENABLED CameraHandler cameraHandler(&deviceConfig, &ledStateManager); #endif // SIM_ENABLED -WiFiHandler wifiHandler(&deviceConfig, &wifiStateManager, &ledStateManager, WIFI_SSID, WIFI_PASSWORD, WIFI_CHANNEL); -APIServer apiServer(CONTROL_SERVER_PORT, &deviceConfig, &cameraHandler, &wifiStateManager, "/control"); +WiFiHandler wifiHandler(&deviceConfig, + &wifiStateManager, + &ledStateManager, + WIFI_SSID, + WIFI_PASSWORD, + WIFI_CHANNEL); +APIServer apiServer(CONTROL_SERVER_PORT, + &deviceConfig, + &cameraHandler, + &wifiStateManager, + "/control"); MDNSHandler mdnsHandler(&mdnsStateManager, &deviceConfig); #ifndef SIM_ENABLED diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh index da7fad9..392a8c6 100644 --- a/repo-tools/scripts/prepareCMD.sh +++ b/repo-tools/scripts/prepareCMD.sh @@ -1,9 +1,5 @@ #!/bin/bash -# create a vairable to hold a passed in argument -# this argument is the next release version -# this is passed in from the .releaserc file - sudo apt-get install -y jq nextReleaseVersion=$1 @@ -34,13 +30,8 @@ if [[ $nextReleaseVersion =~ [a-zA-Z] ]]; then fi fi -# print the next release version - printf "[prepareCMD.sh]: Next version: ${nextReleaseVersion}\n" - -# This script is used to execute the prepareCMD.sh script on the remote host printf "[prepareCMD.sh]: Executing prepareCMD.sh on remote host \n" - printf "[prepareCMD.sh]: Updating the version in the library.json file \n" # make a temp file @@ -52,43 +43,20 @@ printf "[prepareCMD.sh]: Done, moving on to next files \n" sed -i -e "/^\[env\]/,/^\[.*\]/ s|^\(custom_firmware_version[ \t]*=[ \t]*\).*$|\1$nextReleaseVersion|" "./ESP/ini/dev_config.ini" -#pip3 install yq -# -#export PATH="~/.local/bin:$PATH" -#source ~/.bashrc -# -#tmp=$(mktemp) -#tomlq -t --arg version "$nextReleaseVersion" '.env.custom_firmware_version |= $version' ./ESP/ini/dev_config.ini > "$tmp" && mv "$tmp" ./ESP/ini/dev_config.ini -f - -printf "[prepareCMD.sh]: Done, continuing with release. \n" - -# mass rename files in the ./build sub folders +printf "[prepareCMD.sh]: Updating the version in the dev_config.ini file \n" printf "[prepareCMD.sh]: Mass renaming files in the ./build sub folders \n" -#create an array of all the sub folders in the build folder buildPaths=($(ls ./build)) - # loop through all the sub folders in the build folder for buildPath in "${buildPaths[@]}" do printf "[prepareCMD.sh]: Build Path: ${buildPath} \n" - # create a variable to hold the path to the sub folder - buildPath="./build/${buildPath}" - - # create a variable to hold the path to the sub folder's files - buildPathFiles=($(ls ${buildPath})) - #create a variable that holds the current directory - currentDir=$(pwd) - - #parse out the parent folder name and store it in a variable - buildPathFileSubFolder=$(basename $(dirname ${buildPathFiles})) - - # append the sub folder name to the next release version - nextReleaseVersion="${buildPathFileSubFolder}-v${nextReleaseVersion}-master" - - mv ${buildPathFile} ${buildPath}/${nextReleaseVersion}.zip + fileToRename=$(ls ./build/${buildPath}) + newFileName=$(echo $fileToRename | sed "s/v[0-9]*\.[0-9]*\.[0-9]*/v${nextReleaseVersion}/g") + printf "[prepareCMD.sh]: Renaming file: ${fileToRename} to ${newFileName} \n" + mv ./build/${buildPath}/${fileToRename} ./build/${buildPath}/${newFileName} done -printf "[prepareCMD.sh]: Done \n" +printf "[prepareCMD.sh]: Done, continuing with release. \n" From 30e1782c3c58236016f6d875f68f5187ebd07a18 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 14:32:52 +0000 Subject: [PATCH 14/22] chore(patch): 1.0.5 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.5](https://github.com/lorow/OpenIris/compare/v1.0.4...v1.0.5) (2023-03-21) ### 🐛 Bug Fixes * prepareCMD rename zip files before release ([2ef8b74](https://github.com/lorow/OpenIris/commit/2ef8b7428d4a4bdf4c5db86236cb9bed1bcd19b4)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0843766..e0f2db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.5](https://github.com/lorow/OpenIris/compare/v1.0.4...v1.0.5) (2023-03-21) + + +### 🐛 Bug Fixes + +* prepareCMD rename zip files before release ([2ef8b74](https://github.com/lorow/OpenIris/commit/2ef8b7428d4a4bdf4c5db86236cb9bed1bcd19b4)) + ## [1.0.4](https://github.com/lorow/OpenIris/compare/v1.0.3...v1.0.4) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index b4556c1..5027f00 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 1.0.4 +custom_firmware_version = 1.0.5 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 4e91c71..ab3c64e 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.4", + "version": "1.0.5", "frameworks": "arduino", "platforms": "espressif32" } From 2170f336439e85f4d57ddd76c1c08a8cabeda7cf Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 14:43:38 +0000 Subject: [PATCH 15/22] fix: prepareCMD skipping rename due to missing v --- ESP/tools/customname.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ESP/tools/customname.py b/ESP/tools/customname.py index 965bc5a..cc6b836 100644 --- a/ESP/tools/customname.py +++ b/ESP/tools/customname.py @@ -127,7 +127,7 @@ def customName(project, version, commit, branch): firm_version = firm_version.replace("'", "") env.Replace( - PROGNAME="%s-%s-%s" + PROGNAME="%s-v%s-%s" % ( str(env["PIOENV"]), firm_version, From 7aac30a54d18fb8fc98f2a873e98a2e6a84b4b1e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 14:47:14 +0000 Subject: [PATCH 16/22] chore(patch): 1.0.6 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.6](https://github.com/lorow/OpenIris/compare/v1.0.5...v1.0.6) (2023-03-21) ### 🐛 Bug Fixes * prepareCMD skipping rename due to missing v ([2170f33](https://github.com/lorow/OpenIris/commit/2170f336439e85f4d57ddd76c1c08a8cabeda7cf)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0f2db5..677c8a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.6](https://github.com/lorow/OpenIris/compare/v1.0.5...v1.0.6) (2023-03-21) + + +### 🐛 Bug Fixes + +* prepareCMD skipping rename due to missing v ([2170f33](https://github.com/lorow/OpenIris/commit/2170f336439e85f4d57ddd76c1c08a8cabeda7cf)) + ## [1.0.5](https://github.com/lorow/OpenIris/compare/v1.0.4...v1.0.5) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 5027f00..801d324 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 1.0.5 +custom_firmware_version = 1.0.6 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index ab3c64e..a9450e0 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.5", + "version": "1.0.6", "frameworks": "arduino", "platforms": "espressif32" } From 50168a824b66571cf1842df6ea88ddb34d8fc94b Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 14:53:35 +0000 Subject: [PATCH 17/22] refactor: minor refactor just to trigger action --- ESP/src/main.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/ESP/src/main.cpp b/ESP/src/main.cpp index 98048f2..f2b1757 100644 --- a/ESP/src/main.cpp +++ b/ESP/src/main.cpp @@ -14,12 +14,7 @@ int STREAM_SERVER_PORT = 80; int CONTROL_SERVER_PORT = 81; -/** - * @brief ProjectConfig object - * @brief This is the main configuration object for the project - * @param name The name of the project config partition - * @param mdnsName The mDNS hostname to use - */ + ProjectConfig deviceConfig("openiris", MDNS_HOSTNAME); #if ENABLE_OTA @@ -51,11 +46,8 @@ StreamServer streamServer(STREAM_SERVER_PORT, &wifiStateManager); void setup() { setCpuFrequencyMhz(240); // set to 240mhz for performance boost Serial.begin(115200); - // Serial.setDebugOutput(DEBUG_MODE); - // Serial.println("Free Heap: " + String(ESP.getFreeHeap())); Logo::printASCII(); Serial.flush(); - // Serial.println("Free Heap: " + String(ESP.getFreeHeap())); ledManager.begin(); #ifndef SIM_ENABLED deviceConfig.attach(&cameraHandler); @@ -67,20 +59,6 @@ void setup() { wifiHandler.setupWifi(); mdnsHandler.startMDNS(); - /* mdnsStateManager.setState(MDNSState_e::MDNSState_Starting); - switch (mdnsStateManager.getCurrentState()) - { - case MDNSState_e::MDNSState_Starting: - break; - case MDNSState_e::MDNSState_Error: - break; - case MDNSState_e::MDNSState_QueryComplete: - mdnsHandler.startMDNS(); - break; - default: - break; - } */ - switch (wifiStateManager.getCurrentState()) { case WiFiState_e::WiFiState_Disconnected: { //! TODO: Implement From bde2b2ef5892ffe8b35ddb57dae94aef87a65d73 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 14:57:06 +0000 Subject: [PATCH 18/22] chore(patch): 1.0.7 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.7](https://github.com/lorow/OpenIris/compare/v1.0.6...v1.0.7) (2023-03-21) ### 🧑‍💻 Code Refactoring * minor refactor just to trigger action ([50168a8](https://github.com/lorow/OpenIris/commit/50168a824b66571cf1842df6ea88ddb34d8fc94b)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 677c8a3..742eb00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.7](https://github.com/lorow/OpenIris/compare/v1.0.6...v1.0.7) (2023-03-21) + + +### 🧑‍💻 Code Refactoring + +* minor refactor just to trigger action ([50168a8](https://github.com/lorow/OpenIris/commit/50168a824b66571cf1842df6ea88ddb34d8fc94b)) + ## [1.0.6](https://github.com/lorow/OpenIris/compare/v1.0.5...v1.0.6) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 801d324..1559e3b 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 1.0.6 +custom_firmware_version = 1.0.7 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index a9450e0..9c9ee22 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.6", + "version": "1.0.7", "frameworks": "arduino", "platforms": "espressif32" } From 8b188027e1ef158aa05929f2b0b9a74a52d77edd Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 15:31:19 +0000 Subject: [PATCH 19/22] fix: try and change the name of the binary file --- repo-tools/scripts/prepareCMD.sh | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh index 392a8c6..5e98eac 100644 --- a/repo-tools/scripts/prepareCMD.sh +++ b/repo-tools/scripts/prepareCMD.sh @@ -52,10 +52,30 @@ buildPaths=($(ls ./build)) for buildPath in "${buildPaths[@]}" do printf "[prepareCMD.sh]: Build Path: ${buildPath} \n" + # unzip the fileToRename and rename the bin file inside fileToRename=$(ls ./build/${buildPath}) - newFileName=$(echo $fileToRename | sed "s/v[0-9]*\.[0-9]*\.[0-9]*/v${nextReleaseVersion}/g") + unzip -o ./build/${buildPath}/${fileToRename} -d ./build/${buildPath}/ + rm ./build/${buildPath}/${fileToRename} + # create a variable with the name of the bin file + binFile=$(ls ./build/${buildPath}/ | grep .bin) + + # rename the bin file + newBinFileName=$(echo $binFile | sed "s/v[0-9]*\.[0-9]*\.[0-9]*/v${nextReleaseVersion}/g") + mv ./build/${buildPath}/${binFile} ./build/${buildPath}/${newBinFileName} + + # strip the .bin extension from the newBinFileName + newFileName=$(echo $newBinFileName | sed 's/.bin//g') + printf "[prepareCMD.sh]: Renaming file: ${fileToRename} to ${newFileName} \n" - mv ./build/${buildPath}/${fileToRename} ./build/${buildPath}/${newFileName} + # zip the binFile and the manifest.json file + zip -j ./build/${buildPath}/${newFileName}.zip ./build/${buildPath}/${newBinFileName} ./build/${buildPath}/manifest.json + + # remove the binFile and the manifest.json file + rm ./build/${buildPath}/${newBinFileName} + rm ./build/${buildPath}/manifest.json + + # list the contents of the zip file + unzip -l ./build/${buildPath}/${newFileName}.zip done printf "[prepareCMD.sh]: Done, continuing with release. \n" From 61dd12b1c6f37a44abaa069adf3d4666042cb23e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 15:35:05 +0000 Subject: [PATCH 20/22] chore(patch): 1.0.8 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.8](https://github.com/lorow/OpenIris/compare/v1.0.7...v1.0.8) (2023-03-21) ### 🐛 Bug Fixes * try and change the name of the binary file ([8b18802](https://github.com/lorow/OpenIris/commit/8b188027e1ef158aa05929f2b0b9a74a52d77edd)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 742eb00..16cd832 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.8](https://github.com/lorow/OpenIris/compare/v1.0.7...v1.0.8) (2023-03-21) + + +### 🐛 Bug Fixes + +* try and change the name of the binary file ([8b18802](https://github.com/lorow/OpenIris/commit/8b188027e1ef158aa05929f2b0b9a74a52d77edd)) + ## [1.0.7](https://github.com/lorow/OpenIris/compare/v1.0.6...v1.0.7) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 1559e3b..9721a63 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 1.0.7 +custom_firmware_version = 1.0.8 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 9c9ee22..6b91c7e 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.7", + "version": "1.0.8", "frameworks": "arduino", "platforms": "espressif32" } From b0aec4c09f9fa06dae26b9e341e7e3110f5f658b Mon Sep 17 00:00:00 2001 From: ZanzyTHEbar Date: Tue, 21 Mar 2023 15:39:23 +0000 Subject: [PATCH 21/22] fix: revert previous changes --- repo-tools/scripts/prepareCMD.sh | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/repo-tools/scripts/prepareCMD.sh b/repo-tools/scripts/prepareCMD.sh index 5e98eac..de76645 100644 --- a/repo-tools/scripts/prepareCMD.sh +++ b/repo-tools/scripts/prepareCMD.sh @@ -47,35 +47,14 @@ printf "[prepareCMD.sh]: Updating the version in the dev_config.ini file \n" printf "[prepareCMD.sh]: Mass renaming files in the ./build sub folders \n" buildPaths=($(ls ./build)) - # loop through all the sub folders in the build folder for buildPath in "${buildPaths[@]}" do printf "[prepareCMD.sh]: Build Path: ${buildPath} \n" - # unzip the fileToRename and rename the bin file inside fileToRename=$(ls ./build/${buildPath}) - unzip -o ./build/${buildPath}/${fileToRename} -d ./build/${buildPath}/ - rm ./build/${buildPath}/${fileToRename} - # create a variable with the name of the bin file - binFile=$(ls ./build/${buildPath}/ | grep .bin) - - # rename the bin file - newBinFileName=$(echo $binFile | sed "s/v[0-9]*\.[0-9]*\.[0-9]*/v${nextReleaseVersion}/g") - mv ./build/${buildPath}/${binFile} ./build/${buildPath}/${newBinFileName} - - # strip the .bin extension from the newBinFileName - newFileName=$(echo $newBinFileName | sed 's/.bin//g') - + newFileName=$(echo $fileToRename | sed "s/v[0-9]*\.[0-9]*\.[0-9]*/v${nextReleaseVersion}/g") printf "[prepareCMD.sh]: Renaming file: ${fileToRename} to ${newFileName} \n" - # zip the binFile and the manifest.json file - zip -j ./build/${buildPath}/${newFileName}.zip ./build/${buildPath}/${newBinFileName} ./build/${buildPath}/manifest.json - - # remove the binFile and the manifest.json file - rm ./build/${buildPath}/${newBinFileName} - rm ./build/${buildPath}/manifest.json - - # list the contents of the zip file - unzip -l ./build/${buildPath}/${newFileName}.zip + mv ./build/${buildPath}/${fileToRename} ./build/${buildPath}/${newFileName} done printf "[prepareCMD.sh]: Done, continuing with release. \n" From 926134abc15e7ee83cfb8390407df69eab24b916 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 21 Mar 2023 15:43:04 +0000 Subject: [PATCH 22/22] chore(patch): 1.0.9 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [1.0.9](https://github.com/lorow/OpenIris/compare/v1.0.8...v1.0.9) (2023-03-21) ### 🐛 Bug Fixes * revert previous changes ([b0aec4c](https://github.com/lorow/OpenIris/commit/b0aec4c09f9fa06dae26b9e341e7e3110f5f658b)) --- CHANGELOG.md | 7 +++++++ ESP/ini/dev_config.ini | 2 +- ESP/lib/library.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16cd832..98dfe53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ [![semantic versioning](https://img.shields.io/badge/semantic%20versioning-2.0.0-green.svg)](https://semver.org) > All notable changes to this project will be documented in this file +## [1.0.9](https://github.com/lorow/OpenIris/compare/v1.0.8...v1.0.9) (2023-03-21) + + +### 🐛 Bug Fixes + +* revert previous changes ([b0aec4c](https://github.com/lorow/OpenIris/commit/b0aec4c09f9fa06dae26b9e341e7e3110f5f658b)) + ## [1.0.8](https://github.com/lorow/OpenIris/compare/v1.0.7...v1.0.8) (2023-03-21) diff --git a/ESP/ini/dev_config.ini b/ESP/ini/dev_config.ini index 9721a63..5f6d811 100644 --- a/ESP/ini/dev_config.ini +++ b/ESP/ini/dev_config.ini @@ -5,7 +5,7 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -custom_firmware_version = 1.0.8 +custom_firmware_version = 1.0.9 monitor_rts = 0 monitor_dtr = 0 monitor_filters = diff --git a/ESP/lib/library.json b/ESP/lib/library.json index 6b91c7e..4fd159e 100644 --- a/ESP/lib/library.json +++ b/ESP/lib/library.json @@ -20,7 +20,7 @@ "include": "/lib/src" }, "dependencies": {}, - "version": "1.0.8", + "version": "1.0.9", "frameworks": "arduino", "platforms": "espressif32" }