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

Apply project settings o.e.osgi #329

Merged
merged 3 commits into from
Jan 15, 2024

Conversation

Torbjorn-Svensson
Copy link
Contributor

@Torbjorn-Svensson Torbjorn-Svensson commented Oct 1, 2023

  1. Convert to LF and ensure LF at EOF:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e && \
  git checkout src/org/osgi felix
  1. Removed executable flag on files:
find . -type f -executable -print0 | \
  xargs -r0 chmod 644
  1. Format java files:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d` && \
  git checkout src/org/osgi felix

@github-actions
Copy link

github-actions bot commented Oct 1, 2023

Test Results

   25 files  ±0     25 suites  ±0   11m 14s ⏱️ -1s
2 156 tests ±0  2 110 ✅ ±0  46 💤 ±0  0 ❌ ±0 
2 200 runs  ±0  2 154 ✅ ±0  46 💤 ±0  0 ❌ ±0 

Results for commit b3e95db. ± Comparison against base commit b297e05.

♻️ This comment has been updated with latest results.

@Torbjorn-Svensson
Copy link
Contributor Author

Updated PR in accordance with #324 (comment).

@akurtakov
Copy link
Member

I'm leaving this one for @tjwatson to decide.

@tjwatson
Copy link
Contributor

tjwatson commented Nov 9, 2023

Correct me if I am wrong. This isn't urgent to the current release. I will hold off until 2024-03 when the dev branch opens up for the next release.

@Torbjorn-Svensson
Copy link
Contributor Author

No, it's not urgent.

@vogella
Copy link
Contributor

vogella commented Dec 14, 2023

@Torbjorn-Svensson can you fix the conflicts?

@Torbjorn-Svensson
Copy link
Contributor Author

@Torbjorn-Svensson can you fix the conflicts?

Branch rebased on 9658936

@Torbjorn-Svensson
Copy link
Contributor Author

Rebased PR on 1d9eb47.
Anything I need to do prior to getting this merged?

@Torbjorn-Svensson
Copy link
Contributor Author

Rebased PR on b297e05

This was achieved by running:
find . -type f -print0 | \
  xargs -r0 perl -le 'for (@argv) { print if -f && -T }' | \
  xargs -rd'\n' dos2unix -e && \
  git checkout src/org/osgi felix

Signed-off-by: Torbjörn SVENSSON <[email protected]>
This was achieved by running:
find . -type f -executable -print0 | \
  xargs -r0 chmod 644

Signed-off-by: Torbjörn SVENSSON <[email protected]>
This was achieved by running:
eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
  -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d` && \
  git checkout osgi/src/org/osgi felix

Signed-off-by: Torbjörn SVENSSON <[email protected]>
@vogella vogella merged commit 5440fd4 into eclipse-equinox:master Jan 15, 2024
23 of 24 checks passed
@vogella
Copy link
Contributor

vogella commented Jan 15, 2024

Thanks @Torbjorn-Svensson

@Torbjorn-Svensson Torbjorn-Svensson deleted the pr/cleanup-o.e.osgi branch January 15, 2024 14:46
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.

4 participants