Changes to make file, and build action. To simplify it

rvdbreemen · Mar 17, 2024 · bb0eabe · bb0eabe
1 parent 308ce13
commit bb0eabe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -13,7 +13,7 @@ runs:
     - id: filesys
       run: |
         make filesystem
-        mv build/littlefs.bin build/littlefs-${{steps.semver.outputs.semver}}.bin
+        for file in build/*.littlefs.bin; do mv "$file" "build/$(basename ${file%.*}).${{steps.semver.outputs.semver}}.littlefs.bin"; done
       shell: bash
     - id: build
       run: |

diff --git a/Makefile b/Makefile
@@ -30,8 +30,8 @@ TOOLS = $(wildcard arduino/packages/esp8266/hardware/esp8266/*/tools)
 ESPTOOL = python3 $(TOOLS)/esptool/esptool.py
 BOARD = $(PLATFORM):d1_mini
 FQBN = $(BOARD):eesz=4M2M,xtal=160
-IMAGE = build/$(subst :,.,$(BOARD))/$(INO).bin
-FILESYS = build/littlefs.bin
+IMAGE = build/$(INO).bin
+FILESYS = build/$(INO).littlefs.bin
 
 export PYTHONPATH = $(TOOLS)/pyserial
 

diff --git a/version.h b/version.h
@@ -2,15 +2,15 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
 #define _VERSION_PATCH 3
-#define _VERSION_BUILD 2101
-#define _VERSION_GITHASH "d99f272"
+#define _VERSION_BUILD 2102
+#define _VERSION_GITHASH "308ce13"
 #define _VERSION_PRERELEASE beta
 #define _VERSION_DATE "17-03-2024"
-#define _VERSION_TIME "11:46:27"
+#define _VERSION_TIME "23:47:22"
 #define _SEMVER_CORE "0.10.3"
-#define _SEMVER_BUILD "0.10.3+2101"
-#define _SEMVER_GITHASH "0.10.3+d99f272"
-#define _SEMVER_FULL "0.10.3-beta+d99f272"
+#define _SEMVER_BUILD "0.10.3+2102"
+#define _SEMVER_GITHASH "0.10.3+308ce13"
+#define _SEMVER_FULL "0.10.3-beta+308ce13"
 #define _SEMVER_NOBUILD "0.10.3-beta (17-03-2024)"
-#define _VERSION "0.10.3-beta+d99f272 (17-03-2024)"
+#define _VERSION "0.10.3-beta+308ce13 (17-03-2024)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver