-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into bep032
* origin/master: (288 commits) chore(deps): bump codecov/codecov-action from 4 to 5 (#1989) chore: Bump schema post-dev version schema-0.11.3.post3 chore(ci): Fix pytest call for make_archive chore: Remove excess test data from bidsschematools installation directories (#1985) feat(cli): Add tool for filename validation for use in pre-receive hooks (#1986) rm COC (#1979) chore: Bump schema post-dev version schema-0.11.3.post2 Update CONTRIBUTING.md (#1978) fix(schema): Check SliceTiming length against SliceEncodingDirection fix(schema): Do not warn about missing events for task-noise fix(schema): Check for existence of stim_files in beh.tsv chore: Use GITHUB_REF(_NAME) correctly chore: Debug environment chore: Bump schema post-dev version schema-0.11.3.post1 chore: Output version, set correct env var chore: Update publish_schema to publish post-releases fix(schema): Include changes to schema that do not modify spec ... Conflicts: mkdocs.yml src/schema/objects/columns.yaml src/schema/objects/metadata.yaml src/schema/objects/modalities.yaml src/schema/objects/suffixes.yaml src/schema/rules/modalities.yaml
- Loading branch information
Showing
166 changed files
with
5,745 additions
and
2,284 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
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 |
|---|---|---|
|
|
@@ -93,133 +93,11 @@ jobs: | |
| - store_artifacts: | ||
| path: bids-spec.pdf | ||
|
|
||
| # Automatically generate a changelog since migration from Google Docs to GitHub | ||
| github_changelog_generator: | ||
| docker: | ||
| - image: ferrarimarco/github-changelog-generator:1.14.3 | ||
| steps: | ||
| - setup_remote_docker: | ||
| version: 18.06.0-ce | ||
| # checkout code to default ~/project | ||
| - checkout | ||
| - run: | ||
| name: Build changelog | ||
| # $CHANGE_TOKEN is generated via the GitHub web UI, and then securely stored within CircleCI web UI | ||
| command: | | ||
| mkdir ~/changelog_build | ||
| git status | ||
| if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then | ||
| github_changelog_generator \ | ||
| --exclude-tags-regex "^(?!v).*?$" \ | ||
| --user bids-standard \ | ||
| --project bids-specification \ | ||
| --token ${CHANGE_TOKEN} \ | ||
| --output ~/changelog_build/CHANGES.md \ | ||
| --base ~/project/src/pregh-changes.md \ | ||
| --header-label "# Changelog" \ | ||
| --release-branch master \ | ||
| --no-issues \ | ||
| --no-filter-by-milestone \ | ||
| --no-compare-link \ | ||
| --pr-label "" \ | ||
| --enhancement-label "" \ | ||
| --bugs-label "" \ | ||
| --exclude-labels "exclude-from-changelog" | ||
| cat ~/changelog_build/CHANGES.md | ||
| else | ||
| echo "Commit or Release, do nothing" | ||
| fi | ||
| - persist_to_workspace: | ||
| # raw generated changelog in ~/changelog_build/CHANGES.md | ||
| root: ~/. | ||
| paths: | ||
| - changelog_build | ||
|
|
||
| # Lint and fix the auto generated changes.md file | ||
| lint_generated_changelog: | ||
| docker: | ||
| - image: cimg/node:lts | ||
| steps: | ||
| # checkout code to default ~/project | ||
| - checkout | ||
| - attach_workspace: | ||
| # the freshly built CHANGES.md will be in ~/changelog_build/CHANGES.md | ||
| at: ~/. | ||
| - run: | ||
| name: install remark and extensions | ||
| command: npm install `cat npm-requirements.txt` | ||
| - run: | ||
| name: remark on autogenerated CHANGES.md | ||
| # format changelog, then use sed to change * to -, then lint changelog | ||
| command: | | ||
| git status | ||
| if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then | ||
| head -n 100 ~/changelog_build/CHANGES.md | ||
| npx remark-cli ~/changelog_build/CHANGES.md --rc-path ~/project/.remarkrc --output ~/changelog_build/CHANGES.md | ||
| head -n 100 ~/changelog_build/CHANGES.md | ||
| sed -i 's/* /- /' ~/changelog_build/CHANGES.md | ||
| head -n 100 ~/changelog_build/CHANGES.md | ||
| npx remark-cli ~/changelog_build/CHANGES.md --frail --rc-path ~/project/.remarkrc | ||
| else | ||
| echo "Commit or Release, do nothing" | ||
| fi | ||
| - persist_to_workspace: | ||
| # linted and fixed changelog in ~/changelog_build/CHANGES.md | ||
| root: ~/. | ||
| paths: | ||
| - changelog_build | ||
|
|
||
| # Push built changelog to repo | ||
| commit_generated_changelog: | ||
| docker: | ||
| - image: cimg/base:stable | ||
| steps: | ||
| - setup_remote_docker: | ||
| version: 17.11.0-ce | ||
| # checkout code to default ~/project | ||
| - checkout | ||
| - attach_workspace: | ||
| # fixed+linted changelog in ~/changelog_build/CHANGES.md | ||
| at: ~/. | ||
| - run: | ||
| name: Changelog deployment | ||
| # $CHANGE_TOKEN is generated via the GitHub web UI, and then securely stored within CircleCI web UI | ||
| command: | | ||
| if (git log -1 --pretty=%s | grep Merge*) && (! git log -1 --pretty=%b | grep REL:) ; then | ||
| mv ~/changelog_build/CHANGES.md ~/project/src/CHANGES.md | ||
| merge_message=$(git log -1 | grep Merge | grep "pull") | ||
| PR_number=$(echo $merge_message | cut -d ' ' -f 4) | ||
| git config credential.helper 'cache --timeout=120' | ||
| git config user.email "[email protected]" | ||
| git config user.name "bids-maintenance" | ||
| git add ~/project/src/CHANGES.md | ||
| git commit -m "[DOC] Auto-generate changelog entry for PR ${PR_number}" | ||
| git push https://${CHANGE_TOKEN}@github.com/bids-standard/bids-specification.git master | ||
| else | ||
| echo "Commit or Release, do nothing" | ||
| fi | ||
| workflows: | ||
| search_build: | ||
| jobs: | ||
| - build_docs | ||
| - check_links: | ||
| requires: | ||
| - build_docs | ||
| - github_changelog_generator: | ||
| filters: | ||
| branches: | ||
| only: master | ||
| - lint_generated_changelog: | ||
| requires: | ||
| - github_changelog_generator | ||
| filters: | ||
| branches: | ||
| only: master | ||
| - commit_generated_changelog: | ||
| requires: | ||
| - lint_generated_changelog | ||
| filters: | ||
| branches: | ||
| only: master | ||
| - build_docs_pdf | ||
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.