@forge/cli

Index: package/out/deploy/package-upload-deploy.js
===================================================================
--- package/out/deploy/package-upload-deploy.js
+++ package/out/deploy/package-upload-deploy.js
@@ -66,16 +66,16 @@
         const resourcesArchives = await this.resourcePackagingService.zipResources([...preBundledResources, ...nativeUiBundlesDetails], i18nResourceBundle);
         let artifactUrl;
         let hostedResourceUploadId;
         let combinedArtifactUrl;
-        if (details.buildTag) {
+        const shouldUploadCombinedArtifact = await this.statsigService.isCombinedArtifactUploadEnabled();
+        if (shouldUploadCombinedArtifact) {
+            combinedArtifactUrl = await this.archiveUploader.uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, details.modules, details.buildTag);
+        }
+        else if (details.buildTag) {
             artifactUrl = await this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag);
             hostedResourceUploadId = await this.archiveUploader.uploadHostedResources(resourcesArchives, undefined, details.buildTag);
         }
-        else if (details.environmentType &&
-            (await this.statsigService.isCombinedArtifactUploadEnabled(details.environmentType))) {
-            combinedArtifactUrl = await this.archiveUploader.uploadCombinedArtifact(runtimeArchivePath, resourcesArchives, details.modules, details.buildTag);
-        }
         else {
             [artifactUrl, hostedResourceUploadId] = await Promise.all([
                 this.archiveUploader.uploadArchive(runtimeArchivePath, details.buildTag),
                 this.archiveUploader.uploadHostedResources(resourcesArchives, details.environmentKey, details.buildTag)