Merge 61a104ac4e into 197f47befe

Merge pull request #3905 from w00000dy/main
Set stale lable to 'stale' and increase operations-per-run in stale.yml
2024-04-23 23:08:49 +03:00 · 2024-04-16 20:31:16 +02:00 · 2024-04-16 15:07:12 +02:00 · 2024-04-15 22:56:38 +02:00 · 2023-09-29 17:49:59 -04:00
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -12,10 +12,12 @@ jobs:
        with:
          days-before-stale: 120
          days-before-close: 7
+          stale-issue-label: 'stale'
+          stale-pr-label: 'stale'
          exempt-issue-labels: 'pinned,keep,enhancement,confirmed'
          exempt-pr-labels: 'pinned,keep,enhancement,confirmed'
          exempt-all-milestones: true
-          operations-per-run: 150
+          operations-per-run: 1000
          stale-issue-message: >
            Hey! This issue has been open for quite some time without any new comments now.
            It will be closed automatically in a week if no further activity occurs.
--- a/pio-scripts/set_version.py
+++ b/pio-scripts/set_version.py
@ -6,3 +6,7 @@ PACKAGE_FILE = "package.json"
 with open(PACKAGE_FILE, "r") as package:
    version = json.load(package)["version"]
    env.Append(BUILD_FLAGS=[f"-DWLED_VERSION={version}"])
+    if "-b" in version:
+        env.Append(BUILD_FLAGS=[f"-DWLED_BRANCH=beta"])
+    else:
+        env.Append(BUILD_FLAGS=[f"-DWLED_BRANCH=stable"])
--- a/usermods/smartnest/usermod_smartnest.h
+++ b/usermods/smartnest/usermod_smartnest.h
@ -150,6 +150,8 @@ public:
    delay(100);
    sendToBroker("report/firmware", versionString); // Reports the firmware version
    delay(100);
+    sendToBroker("report/branch", branchString); // Reports the firmware branch
+    delay(100);
    sendToBroker("report/ip", (char *)WiFi.localIP().toString().c_str()); // Reports the ip
    delay(100);
    sendToBroker("report/network", (char *)WiFi.SSID().c_str()); // Reports the network name
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@ -613,6 +613,7 @@ void serializeInfo(JsonObject root)
 {
  root[F("ver")] = versionString;
  root[F("vid")] = VERSION;
+  root[F("branch")] = branchString;
  //root[F("cn")] = WLED_CODENAME;

  JsonObject leds = root.createNestedObject("leds");
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@ -313,6 +313,8 @@ void WLED::setup()
  DEBUG_PRINT(versionString);
  DEBUG_PRINT(" ");
  DEBUG_PRINT(VERSION);
+  DEBUG_PRINT(" ");
+  DEBUG_PRINT(branchString);
  DEBUG_PRINTLN(F(" INIT---"));
 #ifdef ARDUINO_ARCH_ESP32
  DEBUG_PRINT(F("esp32 "));
--- a/wled00/wled.h
+++ b/wled00/wled.h
@ -254,8 +254,13 @@ using PSRAMDynamicJsonDocument = BasicJsonDocument<PSRAM_Allocator>;
  #define WLED_VERSION "dev"
 #endif

+#ifndef WLED_BRANCH
+  #define WLED_BRANCH "dev"
+#endif
+
 // Global Variable definitions
 WLED_GLOBAL char versionString[] _INIT(TOSTRING(WLED_VERSION));
+WLED_GLOBAL char branchString[] _INIT(TOSTRING(WLED_BRANCH));
 #define WLED_CODENAME "Hoshi"

 // AP and OTA default passwords (for maximum security change them!)
Autor	SHA1	Wiadomość	Data
Christophe Gagnier	14289c5b0c	Merge `61a104ac4e` into `197f47befe`	2024-04-23 23:08:49 +03:00
Blaž Kristan	197f47befe	Merge pull request #3905 from w00000dy/main Set stale lable to 'stale' and increase operations-per-run in stale.yml	2024-04-16 20:31:16 +02:00
Woody	6272969983	Set stale-pr-label & stale-issue-label to 'stale' in stale.yml Hopefully this fixes the error messages that were thrown the last time the action was executed	2024-04-16 15:07:12 +02:00
Woody	b2e68db380	Increase operations-per-run in stale.yml again	2024-04-15 22:56:38 +02:00
Christophe Gagnier	61a104ac4e	Add information about which branch is being Add the information about which software branch, beta or stable, is being used on this device. This is accessible through both the JSON API and MQTT, just like the version string. This will automatically detect if it is a beta or not based on the release version configured in package.json to make sure it is always set properly. This could be really useful for any consumer of the API that wants to make sure to check the correct channel to know potentially if a device is using the most recent version, for example and also to match it to the correct branch (beta, soundreactive, ...).	2023-09-29 17:49:59 -04:00