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.

Sign up for GitHub

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

Ignore submodule changes (for normal devs) #10754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/refresh-csl-subtrees.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ jobs:
cd src/main/resources/csl-locales
git checkout master
git pull
- name: Persist changes
run: |
git add -f src/main/resources/csl-styles
git add -f src/main/resources/csl-locales
git diff-index --quiet HEAD || git commit -m 'Update CSL styles'
- uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/refresh-journal-lists.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ jobs:
- name: Check whether journal-list.mv can be generated (the "real" generation is done inside JabRef's build process)
run: |
./gradlew generateJournalListMV
- name: Persist changes
run: |
git add -f buildres/abbrv.jabref.org
git diff-index --quiet HEAD || git commit -m 'Update journal abbreviation lists'
- uses: peter-evans/create-pull-request@v5
with:
token: ${{ secrets.GH_TOKEN_UPDATE_GRADLE_WRAPPER }}
Expand Down
12 changes: 9 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
[submodule "buildres/abbrv.jabref.org"]
[submodule "abbrv.jabref.org"]
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.

ignore = all
shallow = true
[submodule "csl-styles"]
path = src/main/resources/csl-styles
url = https://github.com/citation-style-language/styles.git
[submodule "buildres/csl-locales"]
ignore = all
shallow = true
[submodule "csl-locales"]
path = src/main/resources/csl-locales
url = https://github.com/citation-style-language/locales.git
ignore = all
shallow = true