From 18e9d8319b3d56c9d479210e4e8a560b684b37bd Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Sat, 12 Feb 2022 13:00:20 +0100 Subject: [PATCH] Bump up version --- CHANGELOG.md | 7 +++++++ README.md | 12 ++++++------ {{cookiecutter.paper_repo_name}}/.gitlab-ci.yml | 2 +- .../helpers/set-up-overleaf.sh | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a4ae8..c3f09a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ + +## 5.2.2 (2022-02-12) + +Bug fixes: + +* Updating with the right version + ## 5.2.1 (2022-02-12) diff --git a/README.md b/README.md index e0aa26d..8d62ef4 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ The template itself is in the `{{cookiecutter.paper_id}}-paper`. In order to generate a project from the template: * install cookiecutter -* find a paper-cutter tag applicable (usually the latest tag listed at ), say 5.2.1 -* run: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.1` +* find a paper-cutter tag applicable (usually the latest tag listed at ), say 5.2.2 +* run: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.2` You will be asked to choose a LaTeX template, at the moment the following templates are handled: @@ -57,7 +57,7 @@ git remote set-url origin YOUR-GIT-REPO password: `git config credential.helper "cache --timeout=10000000"` 8. Unfortunately, Overleaf will discard hidden files (`.*`) when a zip is uploaded, also file permissions will be somewhat broken -9. … so you need to copy `.cookiecutter.yml` file and re-apply the template (`cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.1 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists`) +9. … so you need to copy `.cookiecutter.yml` file and re-apply the template (`cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.2 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists`) 10. Re-commit the files (including recovered `.*` files). 11. Push the repo to Overleaf (fortunately, the `.*` will be treated correctly when this is done by git): `git push overleaf master` @@ -71,10 +71,10 @@ Updating package with updated template To keep your codebase in sync with template you need to occasionally reapply the template. Here's how: -* find a paper-cutter tag applicable, say 5.2.1 +* find a paper-cutter tag applicable, say 5.2.2 * (do *not* refer to master in your projects!) * go to project root -* run: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.1 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists` +* run: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.2 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists` * check changes with git Editing the files @@ -97,7 +97,7 @@ Switching to another conference or journal template is easy. If not, get in touch with Filip Graliński. 2. Commit or stash any uncommitted changes. 3. Change the `latex_template` value accordingly in the `.cookiecutter.yml` file. Commit the changes. -4. Re-run the template (as if updating, see above: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.1 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists`). +4. Re-run the template (as if updating, see above: `cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.2 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists`). 5. Compare `metadata.tex` against the right metadata template file (`*/*-template-meta.tex` in `_latex-templates/`) and make any fixes needed. This is the only thing that needs to be done manually diff --git a/{{cookiecutter.paper_repo_name}}/.gitlab-ci.yml b/{{cookiecutter.paper_repo_name}}/.gitlab-ci.yml index c8940f4..bfb121f 100644 --- a/{{cookiecutter.paper_repo_name}}/.gitlab-ci.yml +++ b/{{cookiecutter.paper_repo_name}}/.gitlab-ci.yml @@ -6,5 +6,5 @@ variables: # THIS IS AN UGLY WORK-AROUND include: - project: 'research/paper-cutter' - ref: '5.2.1' + ref: '5.2.2' file: 'main.yml' diff --git a/{{cookiecutter.paper_repo_name}}/helpers/set-up-overleaf.sh b/{{cookiecutter.paper_repo_name}}/helpers/set-up-overleaf.sh index 5adf394..f033a01 100755 --- a/{{cookiecutter.paper_repo_name}}/helpers/set-up-overleaf.sh +++ b/{{cookiecutter.paper_repo_name}}/helpers/set-up-overleaf.sh @@ -56,7 +56,7 @@ cp ../$backup_dir/.cookiecutter.yml . git add .cookiecutter.yml git commit -m 'Back cookiecutter config' -cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.1 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists +cookiecutter https://git.wmi.amu.edu.pl/filipg/paper-cutter.git --checkout 5.2.2 --output-dir .. --config-file .cookiecutter.yml --no-input --overwrite-if-exists git add --all git commit -m 'Bring back all the files'