enable gha build by default

Author: vulkoingim

.github/pull_request_template.md

@@ -31,8 +31,8 @@ Does this PR require updates to the documentation at www.gitpod.io/docs?
 
 ## Build Options:
 
-- [ ] /werft with-github-actions
-      Experimental feature to run the build with GitHub Actions (and not in Werft).
+- [ ] /werft with-werft
+      Run the build with werft instead of GHA
 - [ ] leeway-no-cache
       leeway-target=components:all
 - [ ] /werft no-test

.github/workflows/build.yml

@@ -10,16 +10,15 @@ jobs:
 
   configuration:
     name: Configure job parameters
-    runs-on: [self-hosted]
-    concurrency:
-      group: ${{ github.head_ref || github.ref }}-configuration
-      cancel-in-progress: true
+    runs-on: [ssd-runner-set]
+#     concurrency:
+#       group: ${{ github.head_ref || github.ref }}-configuration
+#       cancel-in-progress: true
     outputs:
       is_main_branch: ${{ steps.output.outputs.is_main_branch }}
       version: ${{ steps.output.outputs.version }}
       preview_enable: ${{ steps.output.outputs.preview_enable }}
       preview_infra_provider: ${{ steps.output.outputs.preview_infra_provider }}
-      with_github_actions: ${{ steps.output.outputs.with_github_actions }}
       build_no_cache: ${{ steps.output.outputs.build_no_cache }}
       build_no_test: ${{ steps.output.outputs.build_no_test }}
       build_leeway_target: ${{ steps.output.outputs.build_leeway_target }}
@@ -32,6 +31,7 @@ jobs:
       with_slow_database: ${{ steps.output.outputs.with_slow_database }}
       analytics: ${{ steps.output.outputs.analytics }}
       workspace_feature_flags: ${{ steps.output.outputs.workspace_feature_flags }}
+      with_werft: ${{ steps.output.outputs.with-werft }}
     steps:
       - name: "Determine Branch"
         id: branches
@@ -45,7 +45,6 @@ jobs:
           {
             echo "is_main_branch=${{ (github.head_ref || github.ref) == 'refs/heads/main' }}"
             echo "version=${{ steps.branches.outputs.sanitized-branch-name }}-gha.${{github.run_number}}"
-            echo "with_github_actions=${{ contains(github.event.pull_request.body, '[x] /werft with-github-actions') }}"
             echo "preview_enable=${{ contains(github.event.pull_request.body, '[x] /werft with-preview') }}"
             echo "preview_infra_provider=${{ contains(github.event.pull_request.body, '[X] /werft with-gce-vm') && 'gce' || 'harvester' }}"
             echo "build_no_cache=${{ contains(github.event.pull_request.body, '[x] leeway-no-cache') }}"
@@ -59,17 +58,19 @@ jobs:
             echo "with_ee_license=${{ contains(github.event.pull_request.body, '[X] with-ee-license') }}"
             echo "with_slow_database=${{ contains(github.event.pull_request.body, '[X] with-slow-database') }}"
             echo "analytics=${{ contains(github.event.pull_request.body, '[X] analytics') }}"
+            echo "with_werft=${{ contains(github.event.pull_request.body, '[x] /werft with-werft') }}"
             echo "workspace_feature_flags=$(echo "$PR_DESC" | grep -oP '(?<=\[X\] workspace-feature-flags).*')"
           } >> $GITHUB_OUTPUT
 
   build-previewctl:
     name: Build previewctl
     needs: [configuration]
+    if: ${{ needs.configuration.outputs.preview_enable == 'true' }}
     concurrency:
       group: ${{ github.head_ref || github.ref }}-build-previewctl
       # see comment in build-gitpod below for context
       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
-    runs-on: [self-hosted]
+    runs-on: [ssd-runner-set]
     container:
       image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:mads-leeway-v0.7.3.4
     outputs:
@@ -99,8 +100,8 @@ jobs:
 
   infrastructure:
     needs: [configuration, build-previewctl]
-    if: ${{ needs.configuration.outputs.preview_enable == 'true' && needs.configuration.outputs.with_github_actions == 'true' }}
-    runs-on: [self-hosted]
+    if: ${{ needs.configuration.outputs.preview_enable == 'true' }}
+    runs-on: [ssd-runner-set]
     concurrency:
       group: ${{ github.head_ref || github.ref }}-infrastructure
     steps:
@@ -118,13 +119,13 @@ jobs:
   build-gitpod:
     name: Build Gitpod
     needs: [configuration]
-    if: ${{ needs.configuration.outputs.is_main_branch == 'true' || needs.configuration.outputs.with_github_actions == 'true' }}
-    runs-on: [self-hosted]
-    concurrency:
-      group: ${{ github.head_ref || github.ref }}-build-gitpod
+    runs-on: [ssd-runner-set]
+    if: ${{ needs.configuration.with_werft != 'true' }}
+#     concurrency:
+#       group: ${{ github.head_ref || github.ref }}-build-gitpod
       # For the main branch we always want the build job to run to completion
       # For other branches we only care about the "latest" version, so it is fine to cancel in-progress builds
-      cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
+#       cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
     services:
       mysql:
         image: mysql:5.7
@@ -202,9 +203,9 @@ jobs:
           PR_NO_TEST: ${{needs.configuration.outputs.build_no_test}}
           PR_LEEWAY_TARGET: ${{needs.configuration.outputs.build_leeway_target}}
           NPM_AUTH_TOKEN: '${{ steps.secrets.outputs.npm-auth-token }}'
-          PUBLISH_TO_NPM: ${{ needs.configuration.outputs.publish_to_npm == 'true' }}
+          PUBLISH_TO_NPM: ${{ needs.configuration.outputs.publish_to_npm == 'true'  || needs.configuration.outputs.is_main_branch == 'true' }}
           JB_MARKETPLACE_PUBLISH_TOKEN: '${{ steps.secrets.outputs.jb-marketplace-publish-token }}'
-          PUBLISH_TO_JBPM: ${{ needs.configuration.outputs.publish_to_jbmp == 'true' }}
+          PUBLISH_TO_JBPM: ${{ needs.configuration.outputs.publish_to_jbmp == 'true'  || needs.configuration.outputs.is_main_branch == 'true' }}
           CODECOV_TOKEN: '${{ steps.secrets.outputs.codecov-token }}'
         run: |
           [[ "$PR_NO_CACHE" = "true" ]] && CACHE="none"       || CACHE="remote"
@@ -242,7 +243,7 @@ jobs:
   install:
     name: "Install Gitpod"
     needs: [configuration, build-previewctl, build-gitpod, infrastructure]
-    runs-on: [self-hosted]
+    runs-on: [ssd-runner-set]
     concurrency:
       group: ${{ github.head_ref || github.ref }}-install
       cancel-in-progress: true
@@ -266,7 +267,7 @@ jobs:
   monitoring:
     name: "Install Monitoring Satellite"
     needs: [infrastructure, build-previewctl]
-    runs-on: [self-hosted]
+    runs-on: [ssd-runner-set]
     concurrency:
       group: ${{ github.head_ref || github.ref }}-monitoring
       cancel-in-progress: true

.werft/build.ts

@@ -54,7 +54,7 @@ Tracing.initialize()
 async function run(context: any) {
     const config = jobConfig(werft, context);
 
-    if(config.withGitHubActions) {
+    if(!config.withWerft) {
         werft.phase("Build Disabled");
         werft.log("(not building)","The build is being performed via GitHub Actions; Thus, this Werft build does not run");
         werft.done("(not building)");

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

@@ -44,7 +44,7 @@ export interface JobConfig {
     certIssuer: string;
     recreatePreview: boolean;
     recreateVm: boolean;
-    withGitHubActions: boolean;
+    withWerft: boolean;
     useWsManagerMk2: boolean;
     withGceVm: boolean;
 }
@@ -116,7 +116,7 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
     const analytics = parseAnalytics(werft, sliceId, buildConfig["analytics"])
     const withIntegrationTests = parseWithIntegrationTests(werft, sliceId, buildConfig["with-integration-tests"]);
     const withPreview = decideWithPreview({werft, sliceID: sliceId, buildConfig, mainBuild, withIntegrationTests})
-    const withGitHubActions = "with-github-actions" in buildConfig;
+    const withWerft = "with-werft" in buildConfig;
     const withGceVm = "with-gce-vm" in buildConfig;
 
     switch (buildConfig["cert-issuer"]) {
@@ -188,7 +188,7 @@ export function jobConfig(werft: Werft, context: any): JobConfig {
         recreatePreview,
         recreateVm,
         withSlowDatabase,
-        withGitHubActions,
+        withWerft,
         withDedicatedEmulation,
         useWsManagerMk2,
         withGceVm,