Skip to content

Commit 3acf43d

Browse files
ArthurSensroboquat
authored andcommitted
Werft: Force default annotations for main build
Signed-off-by: ArthurSens <[email protected]>
1 parent 8c7cb82 commit 3acf43d

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

.werft/build.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,26 @@ export async function build(context, version) {
145145
}
146146
return raw.split(",").map(e => e.trim());
147147
})();
148-
const dynamicCPULimits = "dynamic-cpu-limits" in buildConfig;
148+
149+
150+
// Main build should only contain the annotations below:
151+
// ['with-contrib', 'publish-to-npm', 'publish-to-jb-marketplace', 'clean-slate-deployment']
152+
const dynamicCPULimits = "dynamic-cpu-limits" in buildConfig && !mainBuild;
149153
const withContrib = "with-contrib" in buildConfig || mainBuild;
150154
const noPreview = ("no-preview" in buildConfig && buildConfig["no-preview"] !== "false") || publishRelease;
151155
const storage = buildConfig["storage"] || "";
152-
const withIntegrationTests = "with-integration-tests" in buildConfig;
156+
const withIntegrationTests = "with-integration-tests" in buildConfig && !mainBuild;
153157
const publishToNpm = "publish-to-npm" in buildConfig || mainBuild;
154158
const publishToJBMarketplace = "publish-to-jb-marketplace" in buildConfig || mainBuild;
155159
const analytics = buildConfig["analytics"];
156160
const localAppVersion = mainBuild || ("with-localapp-version" in buildConfig) ? version : "unknown";
157161
const retag = ("with-retag" in buildConfig) ? "" : "--dont-retag";
158162
const cleanSlateDeployment = mainBuild || ("with-clean-slate-deployment" in buildConfig);
159-
const installEELicense = !("without-ee-license" in buildConfig);
160-
const withPayment= "with-payment" in buildConfig;
161-
const withObservability = "with-observability" in buildConfig;
162-
const withHelm = "with-helm" in buildConfig;
163-
const withVM = "with-vm" in buildConfig;
163+
const installEELicense = !("without-ee-license" in buildConfig) || mainBuild;
164+
const withPayment= "with-payment" in buildConfig && !mainBuild;
165+
const withObservability = "with-observability" in buildConfig && !mainBuild;
166+
const withHelm = "with-helm" in buildConfig && !mainBuild;
167+
const withVM = "with-vm" in buildConfig && !mainBuild;
164168

165169
const jobConfig = {
166170
buildConfig,

0 commit comments

Comments
 (0)