-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(server): cloning bitbucket branches named such as feature/JIRA-123-summary #5367
Conversation
hey @ghuntley can you make this "ready for review", rebase and squash the change set, so we can land it? |
This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
We have community members who are waiting for this. I'm reopening it since it got closed by stalebot. @ghuntley see Sven's comment above. |
Thanks @mikenikles, as a quick update I have found a workaround by simply opening the last commit and checking out the branch in the workspace. If this is potentially going to be resolved soon-ish then that's a pretty acceptable workaround for me in the interim. Appreciate the prompt reply. |
@ghuntley Cross-posting from #6652 (comment):
|
/werft run 👍 started the job as gitpod-build-gh-bb.7 |
@ghuntley please remove the |
/werft run 👍 started the job as gitpod-build-gh-bb.9 |
@JanKoehnlein can you please put this through the wringer and carefully review. Test with
If something needs adjusting please make the needed changes. I was unable to re-test after cherrypicking and was greeted with the following error: |
@ghuntley Have your added your |
Stealing this review 😇 |
Yes, geoff@gitpod.io is in the list and verified. Please steal away and help get this shipped (make sure you double check my work - first PR to the product itself) <3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wow, so many thanks for fixing this bug and also improving the tests!
- Bug fix looks very good 👍
- Works as intended (could reproduce the bug in prod, but not with this PR)
Unfortunately, I wasn't able to run the integration tests:
gitpod /workspace/gitpod/components/server $ npm run test
> @gitpod/server@0.0.0 test
> mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'
/workspace/gitpod/node_modules/ts-node/src/index.ts:750
return new TSError(diagnosticText, diagnosticCodes);
^
TSError: ⨯ Unable to compile TypeScript:
ee/src/auth/email-domain-service.ts:8:25 - error TS7016: Could not find a declaration file for module 'swot-js'. '/workspace/gitpod/node_modules/swot-js/lib/swot.js' implicitly has an 'any' type.
Try `npm i --save-dev @types/swot-js` if it exists or add a new declaration (.d.ts) file containing `declare module 'swot-js';`
8 import * as SwotJs from 'swot-js';
~~~~~~~~~
and the suggested command didn't help:
gitpod /workspace/gitpod/components/server $ npm i --save-dev @types/swot-js
npm WARN ERESOLVE overriding peer dependency
npm WARN ERESOLVE overriding peer dependency
npm ERR! code E404
npm ERR! 404 Not Found - GET https://registry.npmjs.org/@gitpod%2fcontent-service - Not found
npm ERR! 404
npm ERR! 404 '@gitpod/content-service@0.1.5' is not in this registry.
npm ERR! 404 You should bug the author to publish it (or use the name yourself!)
But I guess the problem is located between keyboard and chair. 😅
/approve
/lgtm
LGTM label has been added. Git tree hash: 07f6711e3acbeae5781548b0bb9b28abc29c2cf9
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jankeromnes Associated issue: #5364 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Fixes #5364
observations
Assuming
https://bitbucket.org/gitpod/integration-tests/branch/feature/JIRA-123-summary
as test input the logic did not account for n + 1 segmentscleanup
gitpod-test
user and adjusted tests to expect this username.testing
Here's the output from
npm run test
. You'll need to define theGITPOD_TEST_TOKEN_BITBUCKET
using the recently createdgitpod-test
user. See the password safe for specifics.final thoughts
We should hook up
npm run test
forcomponents/server
into Gitpod's CI/CD so that this test path is validated in the future.Release Notes