Run leeway build

Author: mustard-mh

.github/workflows/jetbrains-auto-update-template.yml

@@ -20,7 +20,7 @@ jobs:
     with:
       task: ${{ inputs.productId }}
 
-  draft-script:
+  update-jetbrains:
     runs-on: ${{ needs.create-runner.outputs.label }}
     container:
       image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525
@@ -39,58 +39,24 @@ jobs:
           yarn
           npm i -g bun
       - name: Find Nightly Target
-        id: target
+        id: find-target
         run: |
           cd ./components/ide/gha-update-image/
           bun run index-jb-nightly.ts --task=1 --productCode=${{ inputs.productCode }}
 
           if [ -f /tmp/__gh_output.txt ]
           then
             cat /tmp/__gh_output.txt >> $GITHUB_OUTPUT
-            cat /tmp/__gh_output.txt >> $GITHUB_STEP_SUMMARY
           fi
-
-  update-jetbrains:
-    runs-on: ${{ needs.create-runner.outputs.label }}
-    container:
-      image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:pd-test-new-preview-gha.24525
-    needs: [ create-runner ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Environment
-        uses: ./.github/actions/setup-environment
-        with:
-          identity_provider: ${{ github.ref == 'refs/heads/main' && secrets.CORE_DEV_PROVIDER || secrets.DEV_PREVIEW_PROVIDER }}
-          service_account: ${{ github.ref == 'refs/heads/main' && secrets.CORE_DEV_SA || secrets.DEV_PREVIEW_SA }}
-          leeway_segment_key: ${{ secrets.LEEWAY_SEGMENT_KEY }}
-      - name: Find downloadUrl
-        id: download-url
-        run: |
-          downloadUrl=$(cat WORKSPACE.yaml | yq r - 'defaultArgs.${{ inputs.productId }}DownloadUrl')
-          echo "::set-output name=downloadUrl::$downloadUrl"
-      - name: Find IDE version to download
-        id: ide-version
-        run: |
-          IDE_VERSIONS_JSON=$(bash ./components/ide/jetbrains/image/resolve-latest-ide-version.sh ${{ inputs.productCode }} ${{ steps.download-url.outputs.downloadUrl }})
-          IDE_BUILD_VERSION=$(echo "$IDE_VERSIONS_JSON" | jq -r .IDE_BUILD_VERSION)
-          IDE_VERSION=$(echo "$IDE_VERSIONS_JSON" | jq -r .IDE_VERSION)
-          echo "IDE_BUILD_VERSION: $IDE_BUILD_VERSION"
-          echo "IDE_VERSION: $IDE_VERSION"
-          echo "::set-output name=ideBuildVersion::$IDE_BUILD_VERSION"
-          echo "::set-output name=ideVersion::$IDE_VERSION"
       - name: Leeway build
-        if: ${{ steps.ide-version.outputs.ideBuildVersion }}
+        if: ${{ steps.find-target.outputs.buildNumber }}
         env:
           LEEWAY_MAX_PROVENANCE_BUNDLE_SIZE: "8388608"
           LEEWAY_REMOTE_CACHE_BUCKET: ${{ github.ref == 'refs/heads/main' && 'leeway-cache-main-c514a01' || 'leeway-cache-dev-3ac8ef5' }}
         run: |
           imageRepoBase=${{ github.ref == 'refs/heads/main' && 'eu.gcr.io/gitpod-core-dev/build' || 'eu.gcr.io/gitpod-dev-artifact/build' }}
-          echo "leeway build -Dversion=latest -DimageRepoBase=$imageRepoBase -DbuildNumber=${{ steps.ide-version.outputs.ideBuildVersion }} components/ide/jetbrains/image:${{ inputs.productId }}-latest -DjbBackendVersion=${{ steps.ide-version.outputs.ideVersion }}"
-          echo "leeway build -Dversion=latest -DimageRepoBase=$imageRepoBase -DbuildNumber=${{ steps.ide-version.outputs.ideBuildVersion }} components/ide/jetbrains/image:${{ inputs.productId }}-latest -DjbBackendVersion=${{ steps.ide-version.outputs.ideVersion }}" >> $GITHUB_STEP_SUMMARY
-      - name: Mock slack content
-        run: |
-          content=$(cat $GITHUB_STEP_SUMMARY)
-          echo "Content from summary: $content"
+          echo "Upgrade latest ${{ inputs.productId }} image with ${{ steps.find-target.outputs.editorSummary }}" >> $GITHUB_STEP_SUMMARY
+          leeway build -Dversion=latest -DimageRepoBase=$imageRepoBase -DbuildNumber=${{ steps.find-target.outputs.buildNumber }} components/ide/jetbrains/image:${{ steps.find-target.outputs.image }}-latest -DjbBackendVersion=${{ steps.find-target.outputs.jbBackendVersion }}
       # - name: Get previous job's status
       #   id: lastrun
       #   uses: filiptronicek/get-last-job-status@main
@@ -100,7 +66,7 @@ jobs:
       #   env:
       #     SLACK_WEBHOOK: ${{ secrets.IDE_SLACK_WEBHOOK }}
       #     SLACK_COLOR: ${{ job.status }}
-      #     SLACK_TITLE: ${{ inputs.productId }}
+      #     SLACK_TITLE: Upgrade latest ${{ inputs.productId }} image with ${{ steps.find-target.outputs.editorSummary }}
       #     SLACK_FOOTER: "<https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|Workflow logs>"
 
   delete-runner:

components/ide/gha-update-image/index-jb-nightly.ts

@@ -74,3 +74,4 @@ console.log(
 appendGitHubOutput(`buildNumber=${targetConfig.platformVersion}`);
 appendGitHubOutput(`image=${task.productId}`);
 appendGitHubOutput(`jbBackendVersion=${targetRelease.version}`);
+appendGitHubOutput(`editorSummary=${releaseItemStr(targetRelease)}`);