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

Ignore submodule changes (for normal devs) #10754

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Conversation

koppor
Copy link
Member

@koppor koppor commented Jan 8, 2024

Via https://stackoverflow.com/a/12527608/873282, I found a solution for our "dirty" sub modules.

The GitHub workflow update is a "wild guess". I would say: Merge and fix the workflows if they don't work.

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@koppor koppor added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 8, 2024
Copy link
Contributor

github-actions bot commented Jan 8, 2024

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

path = buildres/abbrv.jabref.org
url = https://github.com/JabRef/abbrv.jabref.org.git
[submodule "buildres/csl-styles"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the name change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The path itself did not change. The name of the submodule was NOT reflecting the actual path. Since the name is an identifier for humans, I thought, briefty is better. I could also fix the path name, but was afraid that af an update of the path in the future the name would not be updated and thus inconsistent again.

@Siedlerchr Siedlerchr added this pull request to the merge queue Jan 8, 2024
Merged via the queue into main with commit e55e705 Jan 8, 2024
18 checks passed
@Siedlerchr Siedlerchr deleted the ignore-submodules branch January 8, 2024 21:01
Siedlerchr added a commit that referenced this pull request Jan 12, 2024
* upstream/main: (25 commits)
  Remove remainging "testLogging" (#10769)
  Reuse JUnit 5.7's @DisabledIfEnvironmentVariable (#10768)
  Refactored LibraryTab (#10732)
  Fix annotation (#10766)
  Add initial .git-blame-ignore-revs (#10765)
  Streamline test output (#10762)
  Fix NPE when opening and re-opening a library (#10763)
  Changed default status of 'Automatically open folder of attached files' (#10748)
  Implement test cases for search (#10193)
  Add cites field to bib entries for citation relation (#10752)
  Ignore submodule changes (for normal devs) (#10754)
  Fix line endings
  Bump lycheeverse/lychee-action from 1.8.0 to 1.9.0 (#10760)
  Bump appleboy/ssh-action from 1.0.2 to 1.0.3 (#10761)
  Bump org.apache.lucene:lucene-core from 9.9.0 to 9.9.1 (#10759)
  Bump org.openrewrite.rewrite from 6.5.4 to 6.6.3 (#10758)
  Bump org.glassfish.jersey.containers:jersey-container-grizzly2-http (#10755)
  Bump org.jsoup:jsoup from 1.16.2 to 1.17.2 (#10756)
  Bump org.mockito:mockito-core from 5.7.0 to 5.8.0 (#10757)
  Remove abstract
  ...
@koppor
Copy link
Member Author

koppor commented Jan 15, 2024

Works: #10785

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants