-
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2100 from FCP-INDI/rc/v1.8.7
Release v1.8.7
- Loading branch information
Showing
104 changed files
with
3,341 additions
and
625 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Copyright (C) 2024 C-PAC Developers | ||
|
|
||
| # This file is part of C-PAC. | ||
|
|
||
| # C-PAC is free software: you can redistribute it and/or modify it under | ||
| # the terms of the GNU Lesser General Public License as published by the | ||
| # Free Software Foundation, either version 3 of the License, or (at your | ||
| # option) any later version. | ||
|
|
||
| # C-PAC is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| # FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public | ||
| # License for more details. | ||
|
|
||
| # You should have received a copy of the GNU Lesser General Public | ||
| # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| # Update version comment strings | ||
| cd CPAC | ||
| VERSION=$(python -c "from info import __version__; print(('.'.join(('.'.join(__version__[::-1].split('-')[1].split('.')[1:])[::-1], __version__.split('-')[1])) if '-' in __version__ else __version__).split('+', 1)[0])") | ||
| cd .. | ||
| echo "v${VERSION}" > version | ||
| export _SED_COMMAND="s/^(# [Vv]ersion ).*$/# Version ${VERSION}/g" | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| # Mac OSX | ||
| find ./CPAC/resources/configs -name "*.yml" -exec sed -i '' -E "${_SED_COMMAND}" {} \; | ||
| else | ||
| # Linux and others | ||
| find ./CPAC/resources/configs -name "*.yml" -exec sed -i'' -r "${_SED_COMMAND}" {} \; | ||
| fi | ||
| git add version | ||
| VERSIONS=( `git show $(git log --pretty=format:'%h' -n 2 version | tail -n 1):version` `cat version` ) | ||
| export PATTERN="(declare|typeset) -a" | ||
| if [[ "$(declare -p VERSIONS)" =~ $PATTERN ]] | ||
| then | ||
| for DOCKERFILE in $(find ./.github/Dockerfiles -name "*.Dockerfile") | ||
| do | ||
| export IFS="" | ||
| for LINE in $(grep "FROM ghcr\.io/fcp\-indi/c\-pac/.*\-${VERSIONS[0]}" ${DOCKERFILE}) | ||
| do | ||
| echo "Updating stage tags in ${DOCKERFILE}" | ||
| if [[ "$OSTYPE" == "darwin"* ]]; then | ||
| # Mac OSX | ||
| sed -i "" "s/\-${VERSIONS[0]}/\-${VERSIONS[1]}/g" ${DOCKERFILE} | ||
| else | ||
| # Linux and others | ||
| sed -i "s/\-${VERSIONS[0]}/\-${VERSIONS[1]}/g" ${DOCKERFILE} | ||
| fi | ||
| done | ||
| done | ||
| unset IFS | ||
| fi | ||
| git add CPAC/resources/configs .github/Dockerfiles | ||
|
|
||
| # Overwrite top-level Dockerfiles with the CI Dockerfiles | ||
| cp .github/Dockerfiles/C-PAC.develop-jammy.Dockerfile Dockerfile | ||
| cp .github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile variant-ABCD-HCP.Dockerfile | ||
| cp .github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile variant-fMRIPrep-LTS.Dockerfile | ||
| cp .github/Dockerfiles/C-PAC.develop-lite-jammy.Dockerfile variant-lite.Dockerfile | ||
| git add *Dockerfile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # Copyright (C) 2024 C-PAC Developers | ||
|
|
||
| # This file is part of C-PAC. | ||
|
|
||
| # C-PAC is free software: you can redistribute it and/or modify it under | ||
| # the terms of the GNU Lesser General Public License as published by the | ||
| # Free Software Foundation, either version 3 of the License, or (at your | ||
| # option) any later version. | ||
|
|
||
| # C-PAC is distributed in the hope that it will be useful, but WITHOUT | ||
| # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| # FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public | ||
| # License for more details. | ||
|
|
||
| # You should have received a copy of the GNU Lesser General Public | ||
| # License along with C-PAC. If not, see <https://www.gnu.org/licenses/>. | ||
|
|
||
| repos: | ||
| - repo: local | ||
| hooks: | ||
| - id: autoversioning | ||
| name: Update Dockerfiles and version comments | ||
| entry: .github/scripts/autoversioning.sh | ||
| language: script | ||
| files: '.*Dockerfile$|.*\.yaml$|^CPAC/info\.py$' | ||
| - id: update-yaml-comments | ||
| name: Update YAML comments | ||
| entry: CPAC/utils/configuration/yaml_template.py | ||
| language: python | ||
| files: '^CPAC/resources/configs/pipeline_config_.*\.ya?ml' | ||
| additional_dependencies: | ||
| - "click" | ||
| - "nipype" | ||
| - "pathvalidate" | ||
| - "pyyaml" | ||
| - "voluptuous" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.