From 17ef97c3759b1f9f99d96e533abe81767d7d16cc Mon Sep 17 00:00:00 2001
From: Lucy C <12953208+elvece@users.noreply.github.com>
Date: Tue, 5 Jul 2022 13:49:53 -0600
Subject: [PATCH] remove beta flag actions from UI config build (#1617)

* remove beta flag

Co-authored-by: Aiden McClelland <me@drbonez.dev>
---
 backend/Cargo.toml       | 1 -
 backend/build-prod.sh    | 3 ---
 backend/src/lib.rs       | 3 ---
 frontend/build-config.js | 6 +-----
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index bbc29e7f5..40b8d0d58 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -38,7 +38,6 @@ path = "src/bin/embassy-cli.rs"
 
 [features]
 avahi = ["avahi-sys"]
-beta = []
 default = ["avahi", "sound", "metal", "js_engine"]
 dev = []
 metal = []
diff --git a/backend/build-prod.sh b/backend/build-prod.sh
index 4bd479eaa..0eca69eed 100755
--- a/backend/build-prod.sh
+++ b/backend/build-prod.sh
@@ -20,9 +20,6 @@ FLAGS=""
 if [[ "$ENVIRONMENT" =~ (^|-)unstable($|-) ]]; then
 	FLAGS="unstable,$FLAGS"
 fi
-if [[ "$ENVIRONMENT" =~ (^|-)beta($|-) ]]; then
-	FLAGS="beta,$FLAGS"
-fi
 if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then
 	FLAGS="dev,$FLAGS"
 fi
diff --git a/backend/src/lib.rs b/backend/src/lib.rs
index 1eeefd0e2..77e9f1b27 100644
--- a/backend/src/lib.rs
+++ b/backend/src/lib.rs
@@ -1,7 +1,4 @@
-#[cfg(not(feature = "beta"))]
 pub const DEFAULT_MARKETPLACE: &str = "https://marketplace.start9.com";
-#[cfg(feature = "beta")]
-pub const DEFAULT_MARKETPLACE: &str = "https://beta-registry-0-3.start9labs.com";
 pub const BUFFER_SIZE: usize = 1024;
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
 
diff --git a/frontend/build-config.js b/frontend/build-config.js
index f9c115249..d8aebc49b 100755
--- a/frontend/build-config.js
+++ b/frontend/build-config.js
@@ -12,9 +12,5 @@ const origConfig = require('./config.json')
 const registries = require('./registries.json')
 
 origConfig['gitHash'] = gitHash
-if (/(^|-)beta($|-)/.test(env['ENVIRONMENT'] || '')) {
-  origConfig.ui['marketplace'] = registries.beta
-} else {
-  origConfig.ui['marketplace'] = registries.prod
-}
+origConfig.ui['marketplace'] = registries.prod
 fs.writeFileSync('./config.json', JSON.stringify(origConfig, null, 2))