Skip to content

[DONOT MERGE] [breaking-changes] (cherry-pick): Cherrypick commits to upstream/main#3

Closed
ibreakthecloud wants to merge 5 commits intocrl-mainfrom
cherry-pick-from-upstream
Closed

[DONOT MERGE] [breaking-changes] (cherry-pick): Cherrypick commits to upstream/main#3
ibreakthecloud wants to merge 5 commits intocrl-mainfrom
cherry-pick-from-upstream

Conversation

@ibreakthecloud
Copy link
Member

@ibreakthecloud ibreakthecloud commented Jan 30, 2025 •
edited
Loading

This PR cherry-picks the our commits from this repo to the branch checked-out from the upstream main.
Note: Merging this PR might break the existing system if deployed, since now they have migrated away from GitHub Oauth to GitHub Apps.

Commits

Part of: DEVINF-939

@darmiel @Shegox
feat: migration assistant - OAuth App <> GitHub Apps (cla-assistant#1024
f895b5c 
)


Co-authored-by: Tobias Gabriel <tobias.gabriel@sap.com>
@ibreakthecloud ibreakthecloud self-assigned this Jan 30, 2025
@rail
Copy link
Member

rail commented Jan 30, 2025

This looks fine to me, just thinking about how we will pull changes from upstream in the future...
Maybe we should create a new branch based on upstream/main, then apply our changes on top of it? this is similar to what we do in https://github.com/cockroachdb/rules_go/

@ibreakthecloud
Copy link
Member Author

ibreakthecloud commented Feb 3, 2025

This looks fine to me, just thinking about how we will pull changes from upstream in the future... Maybe we should create a new branch based on upstream/main, then apply our changes on top of it? this is similar to what we do in https://github.com/cockroachdb/rules_go/

TFTR @rail. I am addressing it.

bobvawter and others added 4 commits February 3, 2025 13:07
@bobvawter @ibreakthecloud
cla-assistant: Fork for CRL use
4bb014a 
This change adds a standard CRL build and push setup.  It also strips down the
login page since we're not advertising a service for use by other parties.
@bobvawter @ibreakthecloud
cla-assistant: Switch to a SSD-PD for mongodb.
e16feeb 
Troubles with NFS posix locks are giving mongodb heartburn. This change
switches the pod to mount up a persistent SSD.

X-Ref: cockroachdb/dev-inf#52
@rail @ibreakthecloud
Fix layout
4c32441
@rail @ibreakthecloud
Upgrade to latest node/npm
9517715
@ibreakthecloud ibreakthecloud force-pushed the cherry-pick-from-upstream branch from 253f4a2 to 9517715 Compare February 3, 2025 07:41
@coveralls
Copy link

coveralls commented Feb 3, 2025

Pull Request Test Coverage Report for Build 13108634197

Details

  • 2 of 4 (50.0%) changed or added relevant lines in 2 files are covered.
  • 6 unchanged lines in 2 files lost coverage.
  • Overall coverage decreased (-4.1%) to 71.071%
Changes Missing Coverage Covered Lines Changed/Added Lines %
src/server/src/middleware/authenticated.js 1 2 50.0%
src/server/src/util.js 1 2 50.0%
Files with Coverage Reduction New Missed Lines %
src/server/src/services/octokit-plugins/custom-endpoints.js 1 66.67%
src/server/src/graphQueries/github.js 5 31.58%
Totals Coverage Status
Change from base Build 8075494391: -4.1%
Covered Lines: 117
Relevant Lines: 155
💛 - Coveralls

@ibreakthecloud
Copy link
Member Author

ibreakthecloud commented Feb 3, 2025 •
edited
Loading

@rail This PR has following thing:

  • base branch(cherry-pick-from-upstream) was checkout from upstream/main
  • 3 commits was CP'ed from crl-main to cherry-pick-from-upstream

We can close this PR, rename the branch to crl-main(after deleting renaming the old crl-main to crl-main-2023).

@ibreakthecloud ibreakthecloud changed the title [breaking-changes] (cherry-pick): Cherrypick from upstream/main [breaking-changes] (cherry-pick): Cherrypick commits to upstream/main Feb 4, 2025
@ibreakthecloud ibreakthecloud changed the title [breaking-changes] (cherry-pick): Cherrypick commits to upstream/main [DONOT MERGE] [breaking-changes] (cherry-pick): Cherrypick commits to upstream/main Feb 4, 2025
@ibreakthecloud ibreakthecloud deleted the cherry-pick-from-upstream branch February 6, 2025 07:23
@ibreakthecloud
Copy link
Member Author

ibreakthecloud commented Feb 6, 2025

This PR was closed, since the branch name is changed to crl-main-2025

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rail rail rail approved these changes

@jlinder jlinder Awaiting requested review from jlinder

Assignees

@ibreakthecloud ibreakthecloud

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ibreakthecloud @rail @coveralls @darmiel @bobvawter