Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Create Release
on:
push:
branches:
- master
- main
pull_request:
types: [closed]
branches:
- master
- main

jobs:
create-release:
# Only run when PR is merged or direct push to master
# Only run when PR is merged or direct push to main
if: github.event_name == 'push' || (github.event.pull_request.merged == true)
runs-on: ubuntu-latest

Expand All @@ -32,21 +32,21 @@ jobs:
- name: Check if tag exists
id: check_tag
run: |
if git rev-parse "v${{ steps.get_version.outputs.version }}" >/dev/null 2>&1; then
if git rev-parse "${{ steps.get_version.outputs.version }}" >/dev/null 2>&1; then
echo "exists=true" >> $GITHUB_OUTPUT
echo "Tag v${{ steps.get_version.outputs.version }} already exists"
echo "Tag ${{ steps.get_version.outputs.version }} already exists"
else
echo "exists=false" >> $GITHUB_OUTPUT
echo "Tag v${{ steps.get_version.outputs.version }} does not exist"
echo "Tag ${{ steps.get_version.outputs.version }} does not exist"
fi

- name: Create tag
if: steps.check_tag.outputs.exists == 'false'
run: |
git config user.name github-actions[bot]
git config user.email github-actions[bot]@users.noreply.github.com
git tag -a "v${{ steps.get_version.outputs.version }}" -m "Release version ${{ steps.get_version.outputs.version }}"
git push origin "v${{ steps.get_version.outputs.version }}"
git tag -a "${{ steps.get_version.outputs.version }}" -m "Release version ${{ steps.get_version.outputs.version }}"
git push origin "${{ steps.get_version.outputs.version }}"

- name: Extract changelog for version
id: changelog
Expand Down Expand Up @@ -88,8 +88,8 @@ jobs:
if: steps.check_tag.outputs.exists == 'false'
uses: softprops/action-gh-release@v2
with:
tag_name: v${{ steps.get_version.outputs.version }}
name: v${{ steps.get_version.outputs.version }}
tag_name: ${{ steps.get_version.outputs.version }}
name: ${{ steps.get_version.outputs.version }}
body: |
${{ steps.changelog.outputs.changelog }}
draft: false
Expand Down
2 changes: 1 addition & 1 deletion doc/Contributor-Guide/Getting-Started.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Types: `feat`, `fix`, `docs`, `test`, `refactor`, `perf`, `chore`
7. **Request review** from maintainers
8. **Address feedback** and update PR
9. **Squash commits** before merge if requested
10. **Merge to develop**, then maintainers merge to master
10. **Merge to develop**, then maintainers merge to main

### Code Review Process

Expand Down
2 changes: 1 addition & 1 deletion doc/Contributor-Guide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ See [Extension-Points.md](Extension-Points.md) for detailed examples.
- Respond to review feedback
- Push updates (don't force-push)
- Wait for approval
- Maintainer merges to develop, then master
- Maintainer merges to develop, then main

## Resources

Expand Down
10 changes: 5 additions & 5 deletions doc/Contributor-Guide/Submitting-Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ Once approved:
1. **Squash commits** if requested (multiple commits combined)
2. **Merge to develop** via GitHub
3. **Delete feature branch**
4. **Maintainer merges develop → master** periodically
4. **Maintainer merges develop → main** periodically

## Changelog Updates

Expand Down Expand Up @@ -398,15 +398,15 @@ Releases follow semantic versioning: `MAJOR.MINOR.PATCH`

3. **Create release commit**
```bash
git checkout master
git pull origin master
git checkout main
git pull origin main
git commit -am "release: version 0.0.37"
```

4. **Tag release**
```bash
git tag -a v0.0.37 -m "Release version 0.0.37"
git push origin master --tags
git tag -a 0.0.37 -m "Release version 0.0.37"
git push origin main --tags
```

5. **Create GitHub release**
Expand Down
4 changes: 2 additions & 2 deletions doc/Contributor-Guide/Testing-Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,8 @@ public function testUserValidation(): void
Tests run automatically via GitHub Actions:

1. **On every push** to branches
2. **On pull requests** to develop/master
3. **Required before merge** to master (checks coverage, failures)
2. **On pull requests** to develop/main
3. **Required before merge** to main (checks coverage, failures)

Verify locally before pushing:

Expand Down