Refactor PRODUCTION_BUILD, PR_BUILD, and STABLE_BUILD. We stop exposing them since they are already set automatically, and limit their usage.

.github/workflows/linux_server_build.yml

@@ -158,7 +158,6 @@ jobs:
 
         # Tagged builds. E.g. release or release candidate builds.
         if [ "${{github.ref_type}}" == "tag" ]; then
-          echo "PRODUCTION_BUILD=true" >> $GITHUB_ENV
           echo "OVERTE_RELEASE_TYPE=PRODUCTION" >> $GITHUB_ENV
         else
           echo "OVERTE_RELEASE_TYPE=PR" >> $GITHUB_ENV

.github/workflows/master_build.yml

@@ -14,7 +14,6 @@ env:
   APP_NAME: interface
   BUILD_TYPE: Release
   GIT_COMMIT: ${{ github.sha }}
-  STABLE_BUILD: 0
   UPLOAD_BUCKET: overte-public
   UPLOAD_REGION: fra1
   UPLOAD_ENDPOINT: "https://fra1.digitaloceanspaces.com"

.github/workflows/release_build.yml

@@ -16,8 +16,6 @@ env:
   APP_NAME: interface
   BUILD_TYPE: Release
   GIT_COMMIT: ${{ github.sha }}
-  PRODUCTION_BUILD: true
-  STABLE_BUILD: 1
   UPLOAD_BUCKET: overte-public
   UPLOAD_REGION: fra1
   UPLOAD_ENDPOINT: "https://fra1.digitaloceanspaces.com"

BUILD.md

@@ -70,11 +70,6 @@ PRELOADED_SCRIPT_WHITELIST=ListOfEntries
 HF_PFX_FILE=Path to certificate
 HF_PFX_PASSPHRASE=Passphrase for certificate
 
-// Determine the build type
-PRODUCTION_BUILD=0|1
-PR_BUILD=0|1
-STABLE_BUILD=0|1
-
 // Determine if to utilize testing or stable directory services URLs
 USE_STABLE_GLOBAL_SERVICES=1
 BUILD_GLOBAL_SERVICES=STABLE

INSTALLER.md

@@ -109,7 +109,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
 1. Ensure you have all the prerequisites fulfilled from the [MacOS Build Guide](BUILD_OSX.md).
 2. Perform a clean CMake in your build folder. e.g.
     ```bash
-    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 STABLE_BUILD=1 PRODUCTION_BUILD=1 cmake -DOVERTE_GIT_COMMIT_SHORT="Insert short hash of your last Git commit" -DOVERTE_RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" -DOVERTE_RELEASE_TYPE=PRODUCTION -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DOVERTE_BUILD_SERVER=0 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
+    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 cmake -DOVERTE_GIT_COMMIT_SHORT="Insert short hash of your last Git commit" -DOVERTE_RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" -DOVERTE_RELEASE_TYPE=PRODUCTION -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DOVERTE_BUILD_SERVER=0 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
     ```
 3. Pick a method to build and package your release.
 
@@ -188,9 +188,6 @@ cd overte
 mkdir build
 rm -rf build/*
 conan install . -s build_type=Release -b missing -pr:b=default -of build
-```
-Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
-```bash
 cmake --preset conan-release -DOVERTE_BUILD_CLIENT=false -DOVERTE_BUILD_TOOLS=true
 ```
 
@@ -220,9 +217,6 @@ cd overte
 mkdir build
 rm -rf build/*
 conan install . -s build_type=Release -b missing -pr:b=default -of build
-```
-Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds.
-```bash
 cmake --preset conan-release -DOVERTE_BUILD_CLIENT=false -DOVERTE_BUILD_TOOLS=true
 ```
 

cmake/macros/SetPackagingParameters.cmake

@@ -14,16 +14,12 @@
 # and decides how targets should be packaged.
 
 macro(SET_PACKAGING_PARAMETERS)
-  set(PR_BUILD 0)
-  set(PRODUCTION_BUILD 0)
-  set(DEV_BUILD 0)
   set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
   set(USE_STABLE_GLOBAL_SERVICES 0)
   set(OVERTE_GIT_COMMIT_SHORT 0 CACHE STRING "Short Git commit hash to use for versioning.")
 
   set(APP_USER_MODEL_ID "com.highfidelity.console-dev")
 
-  set_from_env(STABLE_BUILD STABLE_BUILD 0)
   set(OVERTE_RELEASE_TYPE "DEV" CACHE STRING "Valid options are: 'PRODUCTION', 'PR', 'NIGHTLY', and 'DEV'.")
   set(OVERTE_RELEASE_NUMBER "0000.00.0" CACHE STRING "Release version number. E.g. 2025.05.1-rc1 for the first release candidate of the first release in May 2025.")
 
@@ -67,8 +63,8 @@ macro(SET_PACKAGING_PARAMETERS)
     endif ()
 
     if (NOT BYPASS_SIGNING)
-      set(BYPASS_SIGNING 0)
-    endif ()      
+        set(BYPASS_SIGNING 0)
+    endif()
 
   elseif (OVERTE_RELEASE_TYPE STREQUAL "PR")
     set(PR_BUILD 1)
@@ -108,14 +104,6 @@ macro(SET_PACKAGING_PARAMETERS)
     set(NITPICK_ICON_PREFIX "nitpick-beta")
   endif ()
 
-  # if STABLE_BUILD is 1, PRODUCTION_BUILD must be 1 and
-  # DEV_BUILD and PR_BUILD must be 0
-  if (STABLE_BUILD)
-    if ((NOT PRODUCTION_BUILD) OR PR_BUILD OR DEV_BUILD)
-      message(FATAL_ERROR "Cannot produce STABLE_BUILD without PRODUCTION_BUILD")
-    endif ()
-  endif ()
-
   set(BUILD_VERSION_NO_SHA ${BUILD_VERSION})
   if (NOT PRODUCTION_BUILD)
     # append the abbreviated commit SHA to the build version