Skip to content

Commit

Permalink
[contrib] Fix werft/leeway
Browse files Browse the repository at this point in the history
/werft with-contrib
  • Loading branch information
corneliusludmann authored and roboquat committed Sep 2, 2021
1 parent cf753e6 commit 2c70b97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .werft/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export async function build(context, version) {
return raw.split(",").map(e => e.trim());
})();
const dynamicCPULimits = "dynamic-cpu-limits" in buildConfig;
const withInstaller = "with-installer" in buildConfig || mainBuild;
const withContrib = "with-contrib" in buildConfig || mainBuild;
const noPreview = ("no-preview" in buildConfig && buildConfig["no-preview"] !== "false") || publishRelease;
const storage = buildConfig["storage"] || "";
const withIntegrationTests = "with-integration-tests" in buildConfig;
Expand Down Expand Up @@ -146,8 +146,8 @@ export async function build(context, version) {
if (publishRelease) {
exec(`gcloud auth activate-service-account --key-file "/mnt/secrets/gcp-sa-release/service-account.json"`);
}
if (withInstaller || publishRelease) {
exec(`leeway build --werft=true -c ${cacheLevel} ${dontTest ? '--dont-test' : ''} -Dversion=${version} -DimageRepoBase=${imageRepo} install:all`);
if (withContrib || publishRelease) {
exec(`leeway build --werft=true -c ${cacheLevel} ${dontTest ? '--dont-test' : ''} -Dversion=${version} -DimageRepoBase=${imageRepo} contrib:all`);
}
exec(`leeway build --werft=true -c ${cacheLevel} ${retag} --coverage-output-path=${coverageOutput} -Dversion=${version} -DremoveSources=false -DimageRepoBase=${imageRepo} -DlocalAppVersion=${localAppVersion} -DnpmPublishTrigger=${publishToNpm ? Date.now() : 'false'}`);
if (publishRelease) {
Expand Down
2 changes: 0 additions & 2 deletions chart/BUILD.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ packages:
- version
deps:
- chart/config/db/init:release-tar
- install:release-tar
- :helm
config:
commands:
# re-wrap/mv into named tars
- ["sh", "-c", "tar czf gitpod-database-init-${version}.tar.gz -C chart-config-db-init--release-tar . && rm -rf chart-config-db-init--release-tar"]
- ["sh", "-c", "tar czf gitpod-terraform-${version}.tar.gz -C install--release-tar . && rm -rf install--release-tar"]
- ["sh", "-c", "mv chart--helm/*.tgz gitpod-helm-${version}.tar.gz && rm -rf chart--helm"]

0 comments on commit 2c70b97

Please sign in to comment.