diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b5c2d72..74b33d1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -15,6 +15,8 @@ jobs: steps: - name: Clone repository uses: actions/checkout@v3 + with: + submodules: 'recursive' - name: Install Node JS uses: actions/setup-node@v3 diff --git a/bin/XZG.bin b/bin/XZG.bin deleted file mode 100644 index 8d72977..0000000 Binary files a/bin/XZG.bin and /dev/null differ diff --git a/bin/XZG_20240330.full.bin b/bin/XZG_20240330.full.bin index 0ee3977..4f19e0a 100644 Binary files a/bin/XZG_20240330.full.bin and b/bin/XZG_20240330.full.bin differ diff --git a/bin/XZG_20240330.ota.bin b/bin/XZG_20240330.ota.bin index 923e5a7..a7c0460 100644 Binary files a/bin/XZG_20240330.ota.bin and b/bin/XZG_20240330.ota.bin differ diff --git a/bin/XZG_v1.0.1.full.bin b/bin/XZG_v1.0.1.full.bin deleted file mode 100644 index aa23c16..0000000 Binary files a/bin/XZG_v1.0.1.full.bin and /dev/null differ diff --git a/lib/README.md b/lib/README.md index 9fe6205..7e9a4ec 100644 --- a/lib/README.md +++ b/lib/README.md @@ -1 +1,2 @@ +git submodule update --init git submodule update --recursive --remote \ No newline at end of file diff --git a/src/version.h b/src/version.h index 693b9f1..9a98721 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,4 @@ - -// AUTO GENERATED FILE, DO NOT EDIT +// AUTO GENERATED FILE #ifndef VERSION #define VERSION "20240330" #endif diff --git a/tools/.no_version_increment b/tools/.no_version_increment deleted file mode 100644 index e69de29..0000000 diff --git a/tools/build/version_update.py b/tools/build/version_update.py index f3940fb..802a481 100644 --- a/tools/build/version_update.py +++ b/tools/build/version_update.py @@ -19,8 +19,7 @@ def get_formatted_date(dateTimeBuild): dateTimeBuild = datetime.datetime.now() -HEADER_FILE = """ -// AUTO GENERATED FILE +HEADER_FILE = """// AUTO GENERATED FILE #ifndef VERSION #define VERSION "{}" #endif diff --git a/tools/commit.sh b/tools/commit.sh index 1bab540..c51c9eb 100755 --- a/tools/commit.sh +++ b/tools/commit.sh @@ -17,7 +17,6 @@ if [ ! -f "$VERSION_HEADER" ]; then fi # Read version from the version file - version=$(grep '#define VERSION' "$VERSION_HEADER" | awk -F '"' '{print $2}') @@ -38,8 +37,17 @@ $commitMessage" # Committing changes with the formatted commit message git commit -m "$formattedCommitMessage" -# Tagging the commit with the version -git tag "$version" +# Find first free tag +tag=$version +suffix=0 +while git rev-parse "$tag" >/dev/null 2>&1; do + let "suffix+=1" + tag="${version}.${suffix}" +done +echo "Use tag: $tag" + +# Tagging the commit with the version +git tag "$tag" # Pushing changes and tags git push