Skip to content

Commit

Permalink
Add bibliography submodule (#282)
Browse files Browse the repository at this point in the history
* Add bibliography submodule

* Update bibliography submodule

* Add a note on contributing bibliography entries

* Instructions to update bibliography

---------

Co-authored-by: Jean-Noël Grad <[email protected]>
  • Loading branch information
MakisH and jngrad authored Jun 24, 2024
1 parent 8e9708e commit 0fcafc2
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 5,828 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'
- name: Install pandoc
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "bibliography"]
path = bibliography
url = [email protected]:the-teachingRSE-project/bibliography.git
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ objects := competencies.pdf

all: $(objects)

%.pdf: %.md bibliography.bib contributors.yml preamble.sty build/template.tex glossary.tex filter.py
%.pdf: %.md bibliography/bibliography.bib contributors.yml preamble.sty build/template.tex glossary.tex filter.py
@mkdir -p build
@mkdir -p build/svg-inkscape
@rm -f build/pdfa.xmpi
cp --update preamble.sty build/
cp --update bibliography.bib build/
cp --update bibliography/bibliography.bib build/
cp --update glossary.tex build/
python3 filter.py --input="${<}" --output="build/${<}" --contributors="contributors.yml"
pandoc \
Expand Down
43 changes: 43 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,52 @@ You will also need to install a few Python packages:
python3 -m pip install -r requirements.txt
```

### Bibliography

We use a single, shared BibTeX bibliography file for all papers in the teaching RSE project.
This is imported as a git submodule from [another repository](https://github.com/the-teachingRSE-project/bibliography).
See the instructions in that repository if you need to add bibliography entries.

When you first clone this repository, the bibtex folder is empty.
To download the bibliography, run the following commands:

```sh
git submodule update --init --recursive
git config --local submodule.recurse true
```

This will populate the folder with the contents of the remote bibliography repository.
To modify the bibliography, you need to clone
[the-teachingRSE-project/bibliography](https://github.com/the-teachingRSE-project/bibliography),
commit your changes and push them. Then you can synchronize the
local bibliography submodule by running the following commands:

```sh
git submodule update --remote bibliography
git add bibliography
git commit -m 'Synchronize bibliography'
```

If the remote bibliography repository is broken, you can roll back the bibliography version
in the submodule. For example to go back 4 commits in the past, run:

```sh
cd bibliography/
git reset HEAD~4
git checkout .
cd ..
git add bibliography/
git commit -m 'Roll back to an older version of the bibliography'
```

### How to create a pull request

- Fork this repository
- If you clone your fork locally, run
```sh
git submodule update --init --recursive
git config --local submodule.recurse true
```
- Create your changes in your fork
- Go to the [pull requests](https://github.com/CaptainSifff/paper_teaching-learning-RSE/pulls) page of this repository and push `new pull request`
- You can add DRAFT, or WIP to indicate work-in-progress PRs.
Expand Down
1 change: 1 addition & 0 deletions bibliography
Submodule bibliography added at d3fc72
Loading

0 comments on commit 0fcafc2

Please sign in to comment.