fix github workflow number

Author: Lukaswnd

build.sh

@@ -308,7 +308,7 @@ fi
 
 # Generate PlatformIO manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT"
+    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$IDF_BRANCH" -c "$IDF_COMMIT" -n "$GITHUB_RUN_NUMBER"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
@@ -318,7 +318,7 @@ AR_VERSION_UNDERSCORE=`echo "$AR_VERSION" | tr . _`
 # Generate PlatformIO framework manifest file
 rm -rf "$AR_ROOT/package.json"
 if [ "$BUILD_TYPE" = "all" ]; then
-    python3 ./tools/gen_pio_frmwk_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$IDF_COMMIT"
+    python3 ./tools/gen_pio_frmwk_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$IDF_COMMIT" -n "$GITHUB_RUN_NUMBER"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 

tools/gen_pio_frmwk_manifest.py

@@ -12,7 +12,7 @@
     "repository": {
          "type": "git",
         "url": "https://github.com/lukaswnd/esp32-arduino-libs",
-        "build-id": $GITHUB_RUN_NUMBER
+        "build-id": "0"
     },
 }
 
@@ -41,7 +41,7 @@ def convert_version(version_string):
     return ".".join((major, minor, patch))
 
 
-def main(dst_dir, version_string, commit_hash):
+def main(dst_dir, version_string, commit_hash, build_number):
 
     converted_version = convert_version(version_string)
     if not converted_version:
@@ -51,6 +51,7 @@ def main(dst_dir, version_string, commit_hash):
     manifest_file_path = os.path.join(dst_dir, "package.json")
     with open(manifest_file_path, "w", encoding="utf8") as fp:
         MANIFEST_DATA["version"] = f"{converted_version}+sha.{commit_hash}"
+        MANIFEST_DATA["repository"]["build-id"] = build_number
         json.dump(MANIFEST_DATA, fp, indent=2)
 
     print(
@@ -82,6 +83,13 @@ def main(dst_dir, version_string, commit_hash):
         required=True,
         help="ESP-IDF revision in form of a commit hash",
     )
+    parser.add_argument(
+        "-n",
+        "--build-number",
+        dest="build_number",
+        required=True,
+        help="Number of Github workflow build",
+    )
     args = parser.parse_args()
 
-    sys.exit(main(args.dst_dir, args.version_string, args.commit_hash))
+    sys.exit(main(args.dst_dir, args.version_string, args.commit_hash, args.build_number))

tools/gen_platformio_manifest.py

@@ -12,7 +12,7 @@
     "repository": {
         "type": "git",
         "url": "https://github.com/lukaswnd/esp32-arduino-libs",
-        "build-id": $GITHUB_RUN_NUMBER
+        "build-id": "0"
     },
 }
 
@@ -51,6 +51,7 @@ def main(dst_dir, version_string, commit_hash):
     manifest_file_path = os.path.join(dst_dir, "package.json")
     with open(manifest_file_path, "w", encoding="utf8") as fp:
         MANIFEST_DATA["version"] = f"{converted_version}+sha.{commit_hash}"
+        MANIFEST_DATA["repository"]["build-id"] = build_number
         json.dump(MANIFEST_DATA, fp, indent=2)
 
     print(
@@ -82,6 +83,13 @@ def main(dst_dir, version_string, commit_hash):
         required=True,
         help="ESP-IDF revision in form of a commit hash",
     )
+    parser.add_argument(
+        "-n",
+        "--build-number",
+        dest="build_number",
+        required=True,
+        help="Number of Github workflow build",
+    )
     args = parser.parse_args()
 
-    sys.exit(main(args.dst_dir, args.version_string, args.commit_hash))
+    sys.exit(main(args.dst_dir, args.version_string, args.commit_hash, args.build_number))