diff --git a/.github/workflows/code-nightly.yaml b/.github/workflows/code-nightly.yaml index 18d7e6bf2aa7ed..8f27f79bfd0df8 100644 --- a/.github/workflows/code-nightly.yaml +++ b/.github/workflows/code-nightly.yaml @@ -33,7 +33,7 @@ jobs: export LEEWAY_WORKSPACE_ROOT=$(pwd) headCommit=$(curl -H 'Accept: application/vnd.github.VERSION.sha' https://api.github.com/repos/gitpod-io/openvscode-server/commits/gp-code/main) cd components/ide/code - leeway build -Dversion=nightly -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build -DcodeCommit=$headCommit .:docker + leeway build -Dversion=nightly -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build -DcodeCommit=$headCommit -DcodeQuality=insider .:docker - name: Slack Notification if: always() uses: rtCamp/action-slack-notify@v2 diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml index 9e11d14cf1a019..9e549d000b728e 100644 --- a/WORKSPACE.yaml +++ b/WORKSPACE.yaml @@ -7,7 +7,8 @@ defaultArgs: jbMarketplacePublishTrigger: "false" publishToJBMarketplace: true localAppVersion: unknown - codeCommit: 30d694d1f41945af7f8d757d3ddf176b283752cb + codeCommit: 85a18060d91c11ff6de8ba44e02c6c31a5cd907c + codeQuality: stable jetbrainsBackendQualifier: stable intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2022.1.1.tar.gz" golandDownloadUrl: "https://download.jetbrains.com/go/goland-2022.1.tar.gz" diff --git a/components/ide/code/BUILD.yaml b/components/ide/code/BUILD.yaml index c1787276fef5cc..d67696ef1274c2 100644 --- a/components/ide/code/BUILD.yaml +++ b/components/ide/code/BUILD.yaml @@ -9,12 +9,14 @@ packages: argdeps: - imageRepoBase - codeCommit + - codeQuality config: dockerfile: leeway.Dockerfile metadata: helm-component: workspace.codeImage buildArgs: CODE_COMMIT: ${codeCommit} + CODE_QUALITY: ${codeQuality} image: - ${imageRepoBase}/ide/code:${version} - ${imageRepoBase}/ide/code:commit-${__git_commit} \ No newline at end of file diff --git a/components/ide/code/leeway.Dockerfile b/components/ide/code/leeway.Dockerfile index c0aec59c51b0e6..5eb0fc49a34ab5 100644 --- a/components/ide/code/leeway.Dockerfile +++ b/components/ide/code/leeway.Dockerfile @@ -19,6 +19,7 @@ RUN yarn --cwd remote --frozen-lockfile --network-timeout 180000 FROM gitpod/openvscode-server-linux-build-agent:bionic-x64 as code_builder ARG CODE_COMMIT +ARG CODE_QUALITY ARG NODE_VERSION=16.15.0 ARG NVM_DIR="/root/.nvm" @@ -45,6 +46,25 @@ RUN yarn --frozen-lockfile --network-timeout 180000 RUN rm -rf remote/node_modules/ COPY --from=dependencies_builder /gp-code/remote/node_modules/ /gp-code/remote/node_modules/ +RUN nameShort=$(jq --raw-output '.nameShort' product.json) && \ + nameLong=$(jq --raw-output '.nameLong' product.json) && \ + echo $CODE_QUALITY && \ + if [ "$CODE_QUALITY" = "insider" ]; then \ + nameShort="$nameShort - Insiders" \ + nameLong="$nameLong - Insiders" \ + ; fi && \ + setQuality='setpath(["quality"]; $codeQuality)' && \ + setNameShort='setpath(["nameShort"]; $nameShort)' && \ + setNameLong='setpath(["nameLong"]; $nameLong)' && \ + jqCommands="${setQuality} | ${setNameShort} | ${setNameLong}" && \ + cat product.json | jq \ + --arg codeQuality "$CODE_QUALITY" \ + --arg nameShort "$nameShort" \ + --arg nameLong "$nameLong" \ + "${jqCommands}" > product.json.tmp && \ + mv product.json.tmp product.json && \ + cat product.json + RUN yarn --cwd extensions compile \ && yarn gulp vscode-web-min \ && yarn gulp vscode-reh-linux-x64-min