Skip to content
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

Adjust Oomph setup for master->main branch change #3359

Merged
merged 1 commit into from
Jan 12, 2024

Conversation

HeikoKlare
Copy link
Contributor

No description provided.

@HeikoKlare
Copy link
Contributor Author

I've successfully tested the updated setup locally.

@laeubi laeubi requested a review from HannesWell January 12, 2024 15:01
Copy link

Test Results

  579 files  ±0    579 suites  ±0   3h 49m 56s ⏱️ +52s
  382 tests ±0    374 ✅  - 1   7 💤 ±0  0 ❌ ±0  1 🔥 +1 
1 146 runs  ±0  1 123 ✅  - 1  22 💤 ±0  0 ❌ ±0  1 🔥 +1 

For more details on these errors, see this check.

Results for commit 664b1ea. ± Comparison against base commit 178782d.

@laeubi
Copy link
Member

laeubi commented Jan 12, 2024

Maybe @merks can review as well.

@merks
Copy link
Contributor

merks commented Jan 12, 2024

That looks correct if you are renaming the master branch to main.

@akurtakov
Copy link
Member

It already happened thus merging.

@akurtakov akurtakov merged commit 3453518 into eclipse-tycho:main Jan 12, 2024
8 of 10 checks passed
@HeikoKlare HeikoKlare deleted the adjust-oomph-main-branch branch January 12, 2024 16:53
@HannesWell
Copy link
Member

Looks good.
I just wanted to mention that due to the change in the stream name one has to fix existing workspace setups, i.e. the previously referenced stream does not exist anymore and has to be changed to the main stream.
Not ideal, but better do it now than to keep it inconsistent.

For the record to fix
grafik
one has to delete the broken stream reference and just drag-and-drop the new one from the setup in the workspace.
In the end the first line should be replaced by the second line.

<stream href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='tycho']/@streams[name='master']"/>
  <stream href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='tycho']/@streams[name='main']"/>

@HeikoKlare
Copy link
Contributor Author

Thanks for the hint, Hannes! I did not think about that and did not face the problem, as I had not preexisting setup. Sorry for this inconvience. But as you mentioned, it is probably best to have this rename done consistently.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants