Skip to content

Commit 1624cc6

Browse files
vulkoingimroboquat
authored andcommitted
Add missing options to gha build
1 parent c89cecd commit 1624cc6

File tree

4 files changed

+67
-0
lines changed

4 files changed

+67
-0
lines changed

Diff for: .github/actions/deploy-gitpod/entrypoint.sh

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ previewctl get-credentials --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}
3030
PREVIEW_NAME="$(previewctl get-name --branch "${INPUT_NAME}")"
3131
export PREVIEW_NAME
3232

33+
for var in WITH_WS_MANAGER_MK2 WITH_DEDICATED_EMU WITH_EE_LICENSE WITH_SLOW_DATABASE ANALYTICS WORKSPACE_FEATURE_FLAGS; do
34+
input="INPUT_${var}"
35+
export GITPOD_${var}=${!input}
36+
done
37+
3338
previewctl install-context --branch "${PREVIEW_NAME}" --log-level debug --timeout 10m --gcp-service-account "${PREVIEW_ENV_DEV_SA_KEY_PATH}"
3439
leeway run dev/preview:deploy-gitpod
3540
previewctl report >> "${GITHUB_STEP_SUMMARY}"

Diff for: .github/actions/deploy-gitpod/metadata.yml

+18
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ inputs:
1313
previewctl_hash:
1414
description: "The Leeway hash of the dev/preview/previewctl:docker package to be used when downloading previewclt"
1515
required: false
16+
with_ws_manager_mk2:
17+
description: "Use WS Manager MK2"
18+
required: false
19+
with_dedicated_emu:
20+
description: "Dedicated Auth"
21+
required: false
22+
with_ee_licencse:
23+
description: "Use EE license"
24+
required: false
25+
with_slow_database:
26+
description: "Use slow database"
27+
required: false
28+
analytics:
29+
description: "With analytics"
30+
required: false
31+
workspace_feature_flags:
32+
description: "Workspace feature flags"
33+
required: false
1634
runs:
1735
using: "docker"
1836
image: "Dockerfile"

Diff for: .github/pull_request_template.md

+17
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,24 @@ Does this PR require updates to the documentation at www.gitpod.io/docs?
3737
leeway-target=components:all
3838
- [ ] /werft no-test
3939
Run Leeway with `--dont-test`
40+
41+
<details>
42+
<summary>Publish Options</summary>
43+
4044
- [ ] /werft publish-to-npm
45+
- [ ] /werft publish-to-jb-marketplace
46+
</details>
47+
48+
<details>
49+
<summary>Installer Options</summary>
50+
51+
- [ ] with-ee-license
52+
- [ ] with-slow-database
53+
- [ ] with-dedicated-emulation
54+
- [ ] with-ws-manager-mk2
55+
- [ ] workspace-feature-flags
56+
Add desired feature flags to the end of the line above, space separated
57+
</details>
4158

4259
#### Preview Environment Options:
4360
- [ ] /werft with-local-preview

Diff for: .github/workflows/build.yml

+27
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ jobs:
2424
build_leeway_target: ${{ steps.output.outputs.build_leeway_target }}
2525
with_large_vm: ${{ steps.output.outputs.with_large_vm }}
2626
publish_to_npm: ${{ steps.output.outputs.publish_to_npm }}
27+
publish_to_jbmp: ${{ steps.output.outputs.publish_to_jbmp }}
28+
with_ws_manager_mk2: ${{ steps.output.outputs.with_ws_manager_mk2 }}
29+
with_dedicated_emulation: ${{ steps.output.outputs.with_dedicated_emulation }}
30+
with_ee_license: ${{ steps.output.outputs.with_ee_license }}
31+
with_slow_database: ${{ steps.output.outputs.with_slow_database }}
32+
analytics: ${{ steps.output.outputs.analytics }}
33+
workspace_feature_flags: ${{ steps.output.outputs.workspace_feature_flags }}
2734
steps:
2835
- name: "Determine Branch"
2936
id: branches
@@ -45,6 +52,13 @@ jobs:
4552
echo "build_leeway_target=$(echo "$PR_DESC" | sed -n -e 's/^.*leeway-target=//p' | sed 's/\r$//')"
4653
echo "with_large_vm=${{ contains(github.event.pull_request.body, '[X] /werft with-large-vm') }}"
4754
echo "publish_to_npm=${{ contains(github.event.pull_request.body, '[X] /werft publish-to-npm') }}"
55+
echo "publish_to_jbmp=${{ contains(github.event.pull_request.body, '[X] /werft publish-to-jb-marketplace') }}"
56+
echo "with_ws_manager_mk2=${{ contains(github.event.pull_request.body, '[X] with-ws-manager-mk2') }}"
57+
echo "with_dedicated_emulation=${{ contains(github.event.pull_request.body, '[X] with-dedicated-emulation') }}"
58+
echo "with_ee_license=${{ contains(github.event.pull_request.body, '[X] with-ee-license') }}"
59+
echo "with_slow_database=${{ contains(github.event.pull_request.body, '[X] with-slow-database') }}"
60+
echo "analytics=${{ contains(github.event.pull_request.body, '[X] analytics') }}"
61+
echo "workspace_feature_flags=$(echo "$PR_DESC" | grep -oP '(?<=\[X\] workspace-feature-flags).*')"
4862
} >> $GITHUB_OUTPUT
4963
5064
build-previewctl:
@@ -168,6 +182,8 @@ jobs:
168182
secrets: |-
169183
segment-io-token:gitpod-core-dev/segment-io-token
170184
npm-auth-token:gitpod-core-dev/npm-auth-token
185+
jb-marketplace-publish-token:gitpod-core-dev/jb-marketplace-publish-token
186+
codecov-token:gitpod-core-dev/codecov
171187
- name: Leeway Build
172188
id: leeway
173189
shell: bash
@@ -181,6 +197,9 @@ jobs:
181197
PR_LEEWAY_TARGET: ${{needs.configuration.outputs.build_leeway_target}}
182198
NPM_AUTH_TOKEN: '${{ steps.secrets.outputs.npm-auth-token }}'
183199
PUBLISH_TO_NPM: ${{ needs.configuration.outputs.publish_to_npm == 'true' }}
200+
JB_MARKETPLACE_PUBLISH_TOKEN: '${{ steps.secrets.outputs.jb-marketplace-publish-token }}'
201+
PUBLISH_TO_JBPM: ${{ needs.configuration.outputs.publish_to_jbmp == 'true' }}
202+
CODECOV_TOKEN: '${{ steps.secrets.outputs.codecov-token }}'
184203
run: |
185204
[[ "$PR_NO_CACHE" = "true" ]] && CACHE="none" || CACHE="remote"
186205
[[ "$PR_NO_TEST" = "true" ]] && TEST="--dont-test" || TEST=""
@@ -195,9 +214,11 @@ jobs:
195214
--cache $CACHE \
196215
$TEST \
197216
-Dversion=$VERSION \
217+
-DlocalAppVersion=$VERSION \
198218
-DSEGMENT_IO_TOKEN=$SEGMENT_IO_TOKEN \
199219
-DpublishToNPM="${PUBLISH_TO_NPM}" \
200220
-DnpmPublishTrigger="${NPM_PUBLISH_TRIGGER}" \
221+
-DpublishToJBMarketplace="${PUBLISH_TO_JBPM}" \
201222
--coverage-output-path=/__w/gitpod/gitpod/test-coverage-report \
202223
--report report.html || RESULT=$?
203224
set +x
@@ -229,6 +250,12 @@ jobs:
229250
version: ${{needs.configuration.outputs.version}}
230251
sa_key: ${{ secrets.GCP_CREDENTIALS }}
231252
previewctl_hash: ${{ needs.build-previewctl.outputs.previewctl_hash }}
253+
with_ws_manager_mk2: ${{needs.configuration.outputs.with_ws_manager_mk2}}
254+
with_dedicated_emulation: ${{needs.configuration.outputs.with_dedicated_emulation}}
255+
with_ee_license: ${{needs.configuration.outputs.with_ee_license}}
256+
with_slow_database: ${{needs.configuration.outputs.with_slow_database}}
257+
analytics: ${{needs.configuration.outputs.analytics}}
258+
workspace_feature_flags: ${{needs.configuration.outputs.workspace_feature_flags}}
232259

233260
monitoring:
234261
name: "Install Monitoring Satellite"

0 commit comments

Comments
 (0)