Skip to content

Commit

Permalink
Merge branch 'develop' into fix/cisb-to-oscal-cd
Browse files Browse the repository at this point in the history
  • Loading branch information
degenaro authored Dec 3, 2024
2 parents 5d9fd7f + a1bc938 commit 4a869a5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/docs-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ jobs:
with:
python-version: ${{ needs.set-versions.outputs.max }}
- id: versions
env:
REF: ${{ github.event.ref }}
run: |
mike_version=$(python ./scripts/mike_version_parse.py ${{ env.GITHUB_REF }})
mike_version=$(python ./scripts/mike_version_parse.py "$REF")
echo "mver=$mike_version" >> $GITHUB_OUTPUT
deploy-docs:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Upon approval from reviewer(s), the working copy is squashed and merged into the
Upon a cadence established by the maintainers, the develop branch is merged into the main branch and a new release is uniquely numbered and pushed to [pypi](https://pypi.org/project/compliance-trestle/).

`trestle` employs `semantic release` to automatically control release numbering.
Code deliveries should be tagged with prefix `fix:` for changes that are bug fixes or `feat:` for changes that are new features. See [allowed_tags](https://python-semantic-release.readthedocs.io/en/latest/commit-parsing.html#:~:text=The%20default%20configuration%20options%20for%20semantic_release.commit_parser.AngularCommitParser%20are%3A) for a list of supported tags.
Code deliveries should be tagged with prefix `fix:` for changes that are bug fixes or `feat:` for changes that are new features. See [allowed_tags](https://python-semantic-release.readthedocs.io/en/latest/commit_parsing.html#commit-parser-builtin-angular) for a list of supported tags.

### Trestle merging and release workflow

Expand Down

0 comments on commit 4a869a5

Please sign in to comment.