fix: Merge branch 'feature/gh-required' into release/2.7.0

This commit is contained in:
theupriser committed 2026-09-28 10:19:06 +02:00
commit 1830bea979
2 files changed
+6 -3

No files matched your search

+4 -2
View File
@@ -114,8 +114,10 @@ gamescope and the Plasma desktop. Primary target: the Valve Steam Machine
- Up to the release branch, the agent manages it: create the - Up to the release branch, the agent manages it: create the
`feature/`/`bugfix/` branches, commit, push, and merge them into the `feature/`/`bugfix/` branches, commit, push, and merge them into the
release branch itself once tested (with `gh`: `gh pr create --base release branch itself once tested (with `gh`: `gh pr create --base
release/X.Y.Z` + `gh pr merge --merge`, or a plain `git merge --no-ff`; release/X.Y.Z` + `gh pr merge --merge`; no review needed). Without
no review needed). Only the `gh` (`command -v gh`), ask the user to install it (Ubuntu:
`sudo apt install gh`, then `gh auth login`) instead of working around
it. Only the
release branch's pull request into `main` is the user's: never commit release branch's pull request into `main` is the user's: never commit
or merge to `main`, the user merges that one. or merge to `main`, the user merges that one.
Keep a feature/bugfix branch up to date by merging (or rebasing on) Keep a feature/bugfix branch up to date by merging (or rebasing on)
+2 -1
View File
@@ -13,7 +13,8 @@ one per merged pull request.
- `c4ec755` **feat: --defaults --options <ids> (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts** - `c4ec755` **feat: --defaults --options <ids> (exactly these on) replaces --skip; steamify.sh --boot gamescope|desktop on its own switches where an installed conversion starts**
- `eadbdda` **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes** - `eadbdda` **docs: release branches (release/X.Y.Z, feature/ and bugfix/ branches into it, the release into main); CI builds release/** pushes**
- `bee18b7` **docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's** - `bee18b7` **docs: the agent merges feature/bugfix branches into the release branch; the release into main stays the user's**
- **docs: gh or git for merging into the release branch** - `501c0ba` **docs: gh or git for merging into the release branch**
- **docs: gh is required for the release-branch pull requests; ask the user to install it**
## 2.6.0 - 2026-09-27 ## 2.6.0 - 2026-09-27