From d3c553135ab5d9738f517363248c62a8144cce71 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Mon, 30 Jan 2023 18:07:37 +0100 Subject: [PATCH] [FIX] fix version number (#61) * fix version * update dockerfile * add bump version docker recipe * validate citation cff file and add a validation workflow * make dep/laynii_lib.cpp the ground truth for version number and update citation.cff from it * fix wrongly changed cff-version: that is why it is a good thing to validate things in CI --- .github/workflows/validation.yml | 23 +++++++++++++++++++++++ CITATION.cff | 6 +++--- Dockerfile | 8 ++++---- Makefile | 10 ++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/validation.yml diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml new file mode 100644 index 0000000..9a15baf --- /dev/null +++ b/.github/workflows/validation.yml @@ -0,0 +1,23 @@ +name: validation + +on: + push: + branches: ['*'] + pull_request: + branches: ['*'] + +concurrency: + # only run one instance of this workflow at a time + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + + validate_cff: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Check whether the citation metadata from CITATION.cff is valid + uses: citation-file-format/cffconvert-github-action@2.0.0 + with: + args: "--validate" diff --git a/CITATION.cff b/CITATION.cff index b5f1a6f..a5f4ae1 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,4 +1,4 @@ -cff-version: 1.1.0 +cff-version: 1.2.0 message: "If you use this software, please cite it as below." authors: - family-names: Huber @@ -60,6 +60,6 @@ authors: orcid: https://orcid.org/0000-0001-7761-3727 title: "LayNii: A software suite for layer-fMRI" -version: 2.1.1dev -doi: https://doi.org/10.1016/j.neuroimage.2021.118091 +version: v2.3.0 +doi: 10.1016/j.neuroimage.2021.118091 date-released: 2021-07-16 diff --git a/Dockerfile b/Dockerfile index d3c2ba9..3734ee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Generated by: Neurodocker version 0.7.0+0.gdc97516.dirty -# Latest release: Neurodocker version 0.8.0 -# Timestamp: 2022/03/29 17:10:18 UTC +# Latest release: Neurodocker version 0.9.1 +# Timestamp: 2022/12/28 20:15:20 UTC # # Thank you for using Neurodocker. If you discover any issues # or ways to improve this software, please submit an issue or @@ -43,7 +43,7 @@ RUN export ND_ENTRYPOINT="/neurodocker/startup.sh" \ ENTRYPOINT ["/neurodocker/startup.sh"] -LABEL version="2.1.1dev" +LABEL version="v2.3.0" RUN apt-get update -qq \ && apt-get install -y -q --no-install-recommends \ @@ -80,7 +80,7 @@ RUN echo '{ \ \n [ \ \n "label", \ \n { \ - \n "version": "2.1.1dev" \ + \n "version": "v2.3.0" \ \n } \ \n ], \ \n [ \ diff --git a/Makefile b/Makefile index 466e619..283caf3 100755 --- a/Makefile +++ b/Makefile @@ -227,6 +227,16 @@ clean: tests: cd test_data && bash ./tests.sh +# ============================================================================= +# Maintenance + +bump_version: + VERSION=`cat dep/laynii_lib.cpp | grep LayNii | cut -c 21- | rev | cut -c 20- | rev` && \ + echo "\nbumping to version: $$VERSION \n" && \ + sed -i "s/^version:.*/version: $$VERSION/g" CITATION.cff + make Dockerfile + + # ============================================================================= # Docker related content