Bugi 1987708 - nimbus-cli: Use mozilla-firefox/firefox instead of mozilla/gecko-dev

Author: freshstrangemusic

CHANGELOG.md

@@ -16,6 +16,10 @@
 
 [Full Changelog](In progress)
 
+## Nimbus CLI
+- Support for Firefox for Android and Focus via the new
+  [mozilla-firefox](https://github.com/mozilla-firefox/firefox) repository.
+
 # v143.0 (_2025-08-18_)
 
 ## 🦊 What's Changed 🦊

components/support/nimbus-cli/src/config.rs

@@ -150,11 +150,6 @@ impl NimbusApp {
             .ok_or_else(|| anyhow::anyhow!("Either an --app or a --manifest must be specified"))?;
 
         if version.is_none() {
-            // gecko-dev uses master, not main
-            if (app_name == "fenix" || app_name == "focus_android") && ref_ == "main" {
-                return Ok("master".into());
-            }
-
             return Ok(ref_.to_string());
         }
 
@@ -166,7 +161,7 @@ impl NimbusApp {
                 } else if is_before(version, 126) {
                     pad_major(v)
                 } else {
-                    bail!("gecko-dev does not have tagged versions, use --ref instead")
+                    bail!("mozilla-firefox does not have tagged versions, use --ref instead")
                 }
             }
             "focus_android" => {
@@ -175,7 +170,7 @@ impl NimbusApp {
                 } else if is_before(version, 126) {
                     pad_major(v)
                 } else {
-                    bail!("gecko-dev does not have tagged versions, use --ref instead")
+                    bail!("mozilla-firefox does not have tagged versions, use --ref instead")
                 }
             }
             "firefox_ios" => {
@@ -217,7 +212,7 @@ impl NimbusApp {
                 } else if is_before(version, 126) {
                     "mozilla-mobile/firefox-android"
                 } else {
-                    "mozilla/gecko-dev"
+                    "mozilla-firefox/firefox"
                 }
             }
             "focus_android" => {
@@ -226,7 +221,7 @@ impl NimbusApp {
                 } else if is_before(version, 126) {
                     "mozilla-mobile/firefox-android"
                 } else {
-                    "mozilla/gecko-dev"
+                    "mozilla-firefox/firefox"
                 }
             }
             "firefox_ios" => "mozilla-mobile/firefox-ios",

components/support/nimbus-cli/src/main.rs

@@ -716,9 +716,10 @@ mod unit_tests {
 
     fn fenix_manifest_with_ref(ref_: &str) -> ManifestSource {
         ManifestSource::FromGithub {
-            github_repo: "mozilla/gecko-dev".to_string(),
+            github_repo: "mozilla-firefox/firefox".to_string(),
             ref_: ref_.to_string(),
-            manifest_file: "@mozilla/gecko-dev/mobile/android/fenix/app/nimbus.fml.yaml".into(),
+            manifest_file: "@mozilla-firefox/firefox/mobile/android/fenix/app/nimbus.fml.yaml"
+                .into(),
             channel: "developer".to_string(),
         }
     }