ci: added Unleashed Dev to the list of build targets

.github/workflows/create-new-release.yml

@@ -65,7 +65,7 @@ jobs:
  build:
  strategy:
  matrix:
- firmware: [od, os, xs, xd, ul]
+ firmware: [od, os, xs, xd, ul, ud]
 
  runs-on: ubuntu-latest
  needs: [set-new-version, create-release]

.github/workflows/nightly-build.yml

@@ -9,7 +9,7 @@ jobs:
  nightly-build:
  strategy:
  matrix:
- firmware: [od, os, xs, xd, ul]
+ firmware: [od, os, xs, xd, ul, ud]
 
  runs-on: ubuntu-latest
  continue-on-error: true

docs/firmwares.schema.json

@@ -26,18 +26,10 @@
  },
  "type": {
  "description": "Type of firmware reference. `index` - firmware from index; `git-release` - firmware from git releases; `direct-uri` - firmware from direct URI; `git-action` - firmware from github action artifacts",
- "enum": [
- "index",
- "git-release",
- "direct-uri",
- "git-action"
- ]
+ "enum": ["index", "git-release", "direct-uri", "git-action"]
  }
  },
- "required": [
- "alias",
- "description"
- ],
+ "required": ["alias", "description"],
  "unevaluatedProperties ": false
  },
  {
@@ -49,9 +41,7 @@
  "const": "index"
  }
  },
- "required": [
- "type"
- ]
+ "required": ["type"]
  },
  "then": {
  "properties": {
@@ -61,13 +51,10 @@
  },
  "channel": {
  "description": "Index channel to pull firmware from",
- "type": "string"
+ "enum": ["dev", "rc", "release"]
  }
  },
- "required": [
- "index_url",
- "channel"
- ],
+ "required": ["index_url", "channel"],
  "unevaluatedProperties ": false
  },
  "else": false
@@ -79,9 +66,7 @@
  "const": "git-release"
  }
  },
- "required": [
- "type"
- ]
+ "required": ["type"]
  },
  "then": {
  "properties": {
@@ -98,10 +83,7 @@
  "type": "string"
  }
  },
- "required": [
- "git_repo",
- "git_release"
- ],
+ "required": ["git_repo", "git_release"],
  "unevaluatedProperties ": false
  },
  "else": false
@@ -113,21 +95,17 @@
  "const": "direct-uri"
  }
  },
- "required": [
- "type"
- ]
+ "required": ["type"]
  },
  "then": {
  "properties": {
  "uri": {
  "description": "Firmware direct download uri",
  "type": "string",
- "pattern": "^(https?|ftp):\/\/.+"
+ "pattern": "^(https?|ftp)://.+"
  }
  },
- "required": [
- "uri"
- ],
+ "required": ["uri"],
  "unevaluatedProperties ": false
  },
  "else": false
@@ -139,9 +117,7 @@
  "const": "git-action"
  }
  },
- "required": [
- "type"
- ]
+ "required": ["type"]
  },
  "then": {
  "properties": {
@@ -168,18 +144,10 @@
  "git_event": {
  "description": "Github event",
  "type": "string",
- "enum": [
- "push",
- "pull_request",
- "issue"
- ]
+ "enum": ["push", "pull_request", "issue"]
  }
  },
- "required": [
- "git_repo",
- "git_action",
- "git_artifact"
- ],
+ "required": ["git_repo", "git_action", "git_artifact"],
  "unevaluatedProperties ": false
  },
  "else": false
@@ -190,8 +158,6 @@
  }
  }
  },
- "required": [
- "firmwares"
- ],
+ "required": ["firmwares"],
  "unevaluatedProperties ": false
-}
+}

firmwares.json

@@ -2,45 +2,29 @@
  "$schema": "docs/firmwares.schema.json",
  "firmwares": [
  {
- "alias": [
- "od",
- "official-dev",
- "off-dev"
- ],
+ "alias": ["od", "official-dev", "off-dev"],
  "description": "Official Dev",
  "type": "index",
  "index_url": "https://update.flipperzero.one/firmware/directory.json",
  "channel": "dev"
  },
  {
- "alias": [
- "os",
- "official-stable",
- "off-stbl"
- ],
+ "alias": ["os", "official-stable", "off-stbl"],
  "description": "Official Stable",
  "type": "index",
  "index_url": "https://update.flipperzero.one/firmware/directory.json",
  "channel": "release"
  },
  {
- "alias": [
- "xs",
- "xtreme-stable",
- "xts"
- ],
+ "alias": ["xs", "xtreme-stable", "xts"],
  "description": "Xtreme stable",
  "type": "git-release",
  "git_repo": "Flipper-XFW/Xtreme-Firmware",
  "git_release": "latest",
  "sdk_filename_pattern": "-sdk\\.zip$"
  },
  {
- "alias": [
- "xd",
- "xtreme-dev",
- "xtd"
- ],
+ "alias": ["xd", "xtreme-dev", "xtd"],
  "description": "Xtreme dev build",
  "type": "git-action",
  "git_repo": "Flipper-XFW/Xtreme-Firmware",
@@ -51,16 +35,18 @@
  "sdk_filename_pattern": "-sdk-.+\\.zip$"
  },
  {
- "alias": [
- "u",
- "ul",
- "unleashed"
- ],
+ "alias": ["u", "ul", "unleashed"],
  "description": "Unleashed",
- "type": "git-release",
- "git_repo": "DarkFlippers/unleashed-firmware",
- "git_release": "latest",
- "sdk_filename_pattern": "-sdk-.+\\.zip$"
+ "type": "index",
+ "index_url": "https://up.unleashedflip.com/directory.json",
+ "channel": "release"
+ },
+ {
+ "alias": ["ud", "uld", "unleashed-dev"],
+ "description": "Unleashed dev build",
+ "type": "index",
+ "index_url": "https://up.unleashedflip.com/directory.json",
+ "channel": "dev"
  }
  ]
-}
+}

ufbt.ps1

@@ -7,7 +7,7 @@ if (('official-dev', 'off-dev', 'od').Contains($args[0])) {
 elseif (('official-stable', 'off-stbl', 'os').Contains($args[0])) {
  $FW_CDEF = "TOTP_FIRMWARE_OFFICIAL_STABLE"
 }
-elseif (('xtreme-stable', 'xts', 'xs', 'xtreme-dev', 'xtd', 'xd', 'u', 'ul', 'unleashed').Contains($args[0])) {
+elseif (('xtreme-stable', 'xts', 'xs', 'xtreme-dev', 'xtd', 'xd', 'u', 'ul', 'unleashed', 'ud', 'uld', 'unleashed-dev').Contains($args[0])) {
  $FW_CDEF = "TOTP_FIRMWARE_XTREME_UL"
 }
 else {