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
22 changes: 22 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,28 @@ jobs:
config-file: release-please-config.json
manifest-file: .release-please-manifest.json

# The simple release strategy bumps the crate Cargo.toml versions via
# annotated extra-files but cannot touch Cargo.lock, so refresh the
# lockfile on the release branch. release-please force-pushes that
# branch on every main push, and this run re-appends the fix each time.
- uses: actions/checkout@v4
if: ${{ steps.rp.outputs.prs_created == 'true' }}
with:
ref: ${{ fromJSON(steps.rp.outputs.pr).headBranchName }}
- uses: dtolnay/rust-toolchain@stable
if: ${{ steps.rp.outputs.prs_created == 'true' }}
- name: Sync Cargo.lock on release branch
if: ${{ steps.rp.outputs.prs_created == 'true' }}
run: |
cargo update --workspace
if ! git diff --quiet -- Cargo.lock; then
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add Cargo.lock
git commit -m "chore: sync Cargo.lock with release version"
git push
fi

# When release-please cuts a release (its PR was merged), build and
# attach the signed macOS artifacts + updater manifest. release-please
# tags with the default GITHUB_TOKEN, which cannot trigger the tag-push
Expand Down
2 changes: 1 addition & 1 deletion crates/rompatch-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rompatch-core"
version = "0.3.1"
version = "0.3.1" # x-release-please-version
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/rompatch-gui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rompatch-gui"
version = "0.3.1"
version = "0.3.1" # x-release-please-version
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand All @@ -14,7 +14,7 @@ crate-type = ["rlib"]
tauri-build = { version = "=2.6.1", features = [] }

[dependencies]
rompatch-core = { version = "=0.3.1", path = "../rompatch-core", features = ["serde"] }
rompatch-core = { version = "=0.3.1", path = "../rompatch-core", features = ["serde"] } # x-release-please-version
serde = { version = "=1.0.228", features = ["derive"] }
serde_json = "=1.0.149"
sha2 = "=0.10.9"
Expand Down
4 changes: 2 additions & 2 deletions crates/rompatch/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rompatch"
version = "0.3.1"
version = "0.3.1" # x-release-please-version
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand All @@ -11,7 +11,7 @@ name = "rompatch"
path = "src/main.rs"

[dependencies]
rompatch-core = { path = "../rompatch-core", version = "0.3.1" }
rompatch-core = { path = "../rompatch-core", version = "0.3.1" } # x-release-please-version
lexopt = "0.3"

[lints]
Expand Down
14 changes: 13 additions & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
"release-type": "rust",
"release-type": "simple",
"include-component-in-tag": false,
"packages": {
".": {
"component": "rompatch",
"changelog-path": "CHANGELOG.md",
"extra-files": [
{
"type": "generic",
"path": "crates/rompatch-core/Cargo.toml"
},
{
"type": "generic",
"path": "crates/rompatch/Cargo.toml"
},
{
"type": "generic",
"path": "crates/rompatch-gui/Cargo.toml"
},
{
"type": "json",
"path": "crates/rompatch-gui/ui/package.json",
Expand Down
Loading