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
8 changes: 4 additions & 4 deletions CONTRIBUTING.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ ruleset은 pull request가 *어느* 브랜치에서 왔는지를 표현할 수

```bash
git switch develop && git pull
git switch -c release/0.3.0
git switch -c release/0.4.0
# Cargo.toml의 버전을 올리고 CHANGELOG 절을 쓰고 게이트를 돌립니다
# develop으로 풀 리퀘스트를 열어 머지하고, develop -> main 풀 리퀘스트(머지 커밋)를 머지한 뒤 main에 태그를 뗍니다:
git switch main && git pull
git tag -a v0.3.0 -m "Redrob Query v0.3.0"
git push origin refs/tags/v0.3.0:refs/tags/v0.3.0
gh workflow run release.yml --ref main -f tag=v0.3.0
git tag -a v0.4.0 -m "Redrob Query v0.4.0"
git push origin refs/tags/v0.4.0:refs/tags/v0.4.0
gh workflow run release.yml --ref main -f tag=v0.4.0
# 그다음 main을 develop으로 다시 머지합니다
```

Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ from `origin/main`, so tagging straight off `develop` fails instead of shipping.

```bash
git switch develop && git pull
git switch -c release/0.3.0
git switch -c release/0.4.0
# bump the version in Cargo.toml, write the CHANGELOG section, run the gate
# open a pull request into develop and merge it; then a pull request develop -> main
# (merge commit) and tag main:
git switch main && git pull
git tag -a v0.3.0 -m "Redrob Query v0.3.0"
git push origin refs/tags/v0.3.0:refs/tags/v0.3.0
gh workflow run release.yml --ref main -f tag=v0.3.0
git tag -a v0.4.0 -m "Redrob Query v0.4.0"
git push origin refs/tags/v0.4.0:refs/tags/v0.4.0
gh workflow run release.yml --ref main -f tag=v0.4.0
# then merge main back into develop
```

Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ resolver = "3"
members = ["crates/*", "apps/*"]

[workspace.package]
version = "0.3.0"
version = "0.4.0"
edition = "2024"
license = "GPL-3.0-or-later"
rust-version = "1.95"
Expand Down
Loading