Skip to content

Commit 13e2dc3

Browse files
committed
remove no-longer-supported "--dont-retag" Leeway flag
1 parent 275f246 commit 13e2dc3

File tree

5 files changed

+3
-9
lines changed

5 files changed

+3
-9
lines changed

.github/workflows/jetbrains-update-backend-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
- run: |
4646
gcloud auth configure-docker --quiet
4747
export LEEWAY_WORKSPACE_ROOT=$(pwd)
48-
leeway build -Dversion=latest -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build components/ide/jetbrains/backend-plugin:latest --dont-retag
48+
leeway build -Dversion=latest -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build components/ide/jetbrains/backend-plugin:latest

.werft/jobs/build/build-and-publish.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) {
1616
const {
1717
publishRelease,
1818
dontTest,
19-
retag,
2019
version,
2120
localAppVersion,
2221
publishToNpm,
@@ -38,7 +37,7 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) {
3837
exec(
3938
`leeway build --docker-build-options network=host --werft=true -c remote ${
4039
dontTest ? "--dont-test" : ""
41-
} --dont-retag --coverage-output-path=${coverageOutput} --save /tmp/dev.tar.gz -Dversion=${version} -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev dev:all`,
40+
} --coverage-output-path=${coverageOutput} --save /tmp/dev.tar.gz -Dversion=${version} -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev dev:all`,
4241
);
4342

4443
if (publishRelease) {
@@ -61,7 +60,6 @@ export async function buildAndPublish(werft: Werft, jobConfig: JobConfig) {
6160
"--werft=true",
6261
"-c remote",
6362
dontTest ? "--dont-test" : "",
64-
retag,
6563
`--coverage-output-path=${coverageOutput}`,
6664
].filter((value) => value).join(" ");
6765

.werft/jobs/build/job-config.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export interface JobConfig {
2323
publishToJBMarketplace: boolean;
2424
publishToNpm: string;
2525
publishToKots: boolean;
26-
retag: string;
2726
replicatedChannel: string;
2827
storage: string;
2928
version: string;
@@ -98,7 +97,6 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
9897
const publishToKots = "publish-to-kots" in buildConfig || withSelfHostedPreview || mainBuild;
9998

10099
const localAppVersion = mainBuild || "with-localapp-version" in buildConfig ? version : "unknown";
101-
const retag = "with-retag" in buildConfig ? "" : "--dont-retag";
102100
const cleanSlateDeployment = mainBuild || "with-clean-slate-deployment" in buildConfig;
103101
const installEELicense = !("without-ee-license" in buildConfig) || mainBuild;
104102
const withObservability = "with-observability" in buildConfig && !mainBuild;
@@ -165,7 +163,6 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
165163
replicatedChannel,
166164
replicatedVersion,
167165
repository,
168-
retag,
169166
storage,
170167
version,
171168
withContrib,

components/supervisor/hot-deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ echo "Image Version: $version"
1919
bldfn="/tmp/build-$version.tar.gz"
2020

2121
docker ps &> /dev/null || (echo "You need a working Docker daemon. Maybe set DOCKER_HOST?"; exit 1)
22-
leeway build -Dversion="$version" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build .:docker --save "$bldfn" --dont-retag
22+
leeway build -Dversion="$version" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build .:docker --save "$bldfn"
2323
dev_image="$(tar xfO "$bldfn" ./imgnames.txt | head -n1)"
2424
echo "Dev Image: $dev_image"
2525

dev/preview/workflow/preview/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,5 @@ leeway build \
6767
-DREPLICATED_API_TOKEN="$(kubectl --context=dev -n werft get secret replicated -o jsonpath='{.data.token}' | base64 -d)" \
6868
-DREPLICATED_APP="$(kubectl --context=dev -n werft get secret replicated -o jsonpath='{.data.app}' | base64 -d)" \
6969
-Dversion="${VERSION}" \
70-
--dont-retag \
7170
--dont-test \
7271
dev/preview:deploy-dependencies

0 commit comments

Comments
 (0)