Merge pull request 'fix: fix: disinto release creates branch from dirty working tree (#168)' (#175) from fix/issue-168 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
This commit is contained in:
commit
f5de84ae02
1 changed files with 6 additions and 4 deletions
10
bin/disinto
10
bin/disinto
|
|
@ -2943,12 +2943,14 @@ This PR creates a vault item for the release of version ${version}.
|
||||||
3. The vault runner will execute the release formula
|
3. The vault runner will execute the release formula
|
||||||
"
|
"
|
||||||
|
|
||||||
# Create branch
|
# Create branch from clean main
|
||||||
cd "$ops_root"
|
cd "$ops_root"
|
||||||
git checkout -B "$branch_name" 2>/dev/null || git checkout "$branch_name"
|
git checkout main
|
||||||
|
git pull origin main
|
||||||
|
git checkout -B "$branch_name" main
|
||||||
|
|
||||||
# Add and commit
|
# Add and commit only the vault TOML file
|
||||||
git add -A
|
git add "vault/actions/${id}.toml"
|
||||||
git commit -m "$pr_title" -m "$pr_body" 2>/dev/null || true
|
git commit -m "$pr_title" -m "$pr_body" 2>/dev/null || true
|
||||||
|
|
||||||
# Push branch
|
# Push branch
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue