diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2026-05-08 10:47:26 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2026-05-08 10:47:26 +0200 |
| commit | 5e0b4b96bc5ad23ca8d7fad4595e465eef69bf96 (patch) | |
| tree | 0c25ba6ca1614cdb397badfa7d76e63ecb85f6c4 /admin | |
| parent | 730d3884dc3ee540c3d68f64edffa35cb5561f34 (diff) | |
; Adapt files in admin/notes for emacs-31 branch
* admin/notes/emba: Mention scheduled pipelines.
* admin/notes/git-workflow: Adapt for emacs-31 branch.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/emba | 4 | ||||
| -rw-r--r-- | admin/notes/git-workflow | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/admin/notes/emba b/admin/notes/emba index 4bf6f3a9c76..83688e7287b 100644 --- a/admin/notes/emba +++ b/admin/notes/emba @@ -76,6 +76,10 @@ Every pipeline generates a JUnit test report for the respective test jobs, which can be inspected on the pipeline web page. This test report counts completed ERT tests, aborted tests are not counted. +Twice a day, a pipeline for branch 'master', and another pipeline for +branch 'emacs-31' are started automatically, running all stages for +normal and expensive tests. + * Emba configuration The emba configuration files are hosted on diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow index 8e7d597db17..a1d4044df77 100644 --- a/admin/notes/git-workflow +++ b/admin/notes/git-workflow @@ -16,14 +16,14 @@ Initial setup Then we want to clone the repository. We normally want to have both the current master and (if there is one) the active release branch -(eg emacs-30). +(eg emacs-31). mkdir ~/emacs cd ~/emacs git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master cd master git config push.default current -git worktree add ../emacs-30 emacs-30 +git worktree add ../emacs-31 emacs-31 You now have both branches conveniently accessible, and you can do "git pull" in them once in a while to keep updated. @@ -67,7 +67,7 @@ which will look like commit 958b768a6534ae6e77a8547a56fc31b46b63710b -cd ~/emacs/emacs-30 +cd ~/emacs/emacs-31 git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b and add "Backport:" to the commit string. Then @@ -109,7 +109,7 @@ up-to-date by doing a pull. Then start Emacs with emacs -l admin/gitmerge.el -f gitmerge You'll be asked for the branch to merge, which will default to -(eg) 'origin/emacs-30', which you should accept. Merging a local tracking +(eg) 'origin/emacs-31', which you should accept. Merging a local tracking branch is discouraged, since it might not be up-to-date, or worse, contain commits from you which are not yet pushed upstream. |