Skip to content

Commit

Permalink
Merge pull request #5 from xyzroe/main
Browse files Browse the repository at this point in the history
Working on releases for the web installer
  • Loading branch information
xyzroe authored Sep 6, 2023
2 parents d93e251 + 619f8d8 commit be728cb
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 20 deletions.
16 changes: 1 addition & 15 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,6 @@ jobs:
bin/UZG-01.bin
bin/UZG-01_v${{ steps.get_version.outputs.version }}.full.bin
update_manifest:
needs: build_firmware
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
- name: Get Release Version
id: get_version
shell: bash
run: |
value=`cat tools/version`
echo "version=$value" >> $GITHUB_OUTPUT
- name: Updare version in manifest.json
run: |
sed -r 's/v[0-9]{1,4}\.[0-9]{1,4}\.[0-9]{1,4}/v${{ steps.get_version.outputs.version }}/g' manifest.json > new.manifest.json
Expand All @@ -83,4 +69,4 @@ jobs:
uses: actions-js/push@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
message: 'update manifest.json'
message: 'Release v${{ steps.get_version.outputs.version }} (${{ steps.date.outputs.date }})'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ You can contribute to UZG-01 Firmware by
People helping to keep the show on the road - **developers and contributors**:
- [@smlight-dev](https://github.com/smlight-dev/) - for improvement and refactoring of [ZigStarGW-FW](https://github.com/xyzroe/ZigStarGW-FW)
- [@Tarik2142](https://github.com/Tarik2142) for refactoring, code optimizations done under [smlight-dev](https://github.com/mercenaruss/uzg-firmware)
- [@xynroe](https://github.com/xyzroe/) for initial firmware released for ZigStar devices
- [@xyzroe](https://github.com/xyzroe/) for initial firmware released for ZigStar devices

Special thanks goes also to all authors of 3rd party libraries which are used in this project:

Expand Down
Binary file modified bin/UZG-01.bin
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "UZG-FW",
"version": "v0.1.5",
"builds": [
{
"chipFamily": "ESP32",
"improv": false,
"parts": [
{ "path": "bin/UZG-01_v0.1.4.full.bin", "offset": 0 }
{ "path": "bin/UZG-01_v0.1.5.full.bin", "offset": 0 }
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/version.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

// AUTO GENERATED FILE, DO NOT EDIT
#ifndef VERSION
#define VERSION "0.1.4"
#define VERSION "0.1.5"
#endif
#ifndef BUILD_TIMESTAMP
#define BUILD_TIMESTAMP "2023-08-22 01:30:16.538290"
#define BUILD_TIMESTAMP "2023-09-06 12:01:02.723464"
#endif

2 changes: 1 addition & 1 deletion tools/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.4
0.1.5

0 comments on commit be728cb

Please sign in to comment.