From cab0e8d7c331f87e5f664c1580640fb973024cc5 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Tue, 5 Sep 2023 11:09:34 +0200 Subject: CI: Update actions/checkout --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 027cc2d..89aac7e 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -35,7 +35,7 @@ jobs: - 'release-snapshot' - 'snapshot' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: purcell/setup-emacs@master with: version: ${{ matrix.emacs-version }} -- cgit v1.0 From 6cca459f1d47c73098f2dcef69e1b3fc3e71e878 Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Sat, 9 Sep 2023 10:03:49 +0200 Subject: compat.texi: Document development/release practices in the manual --- compat.texi | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/compat.texi b/compat.texi index f56b14f..1fa5e40 100644 --- a/compat.texi +++ b/compat.texi @@ -3355,11 +3355,24 @@ Please note that as a GNU ELPA package, Compat requires contributors to have signed the @uref{https://www.gnu.org/software/emacs/manual/html_node/emacs/Copyright-Assignment.html, FSF copyright assignment}, before any non-trivial contribution -(roughly 15 lines of code) can be applied. It is important that you -provide tests when you contribute new functionality. Compat has 100% -test coverage by the test suite. We use continuous integration to -check if patches preserve existing functionality. +(roughly 15 lines of code) can be applied. +It is important that you provide tests when you contribute new +functionality. Compat has 100% test coverage by the test suite. We +use continuous integration to check if patches preserve existing +functionality. + +Development for the currently stable Emacs version happens in the main +branch of the Compat Git repository. ELPA-devel nightly builds are +created from this branch. New features, which are not yet ready to be +merged directly into the main branch, are developed in feature +branches. Furthermore the Git repository has a branch emacs- +where the development for the upcoming Emacs release takes place. +This branch is separate from the main branch since the new +functionality should not be made available (neither via ELPA nor +ELPA-devel) before the new Emacs version has been reasonably +stabilized, e.g., around the time when the Emacs version branch is +created in the Emacs repository on Savannah. @node Function Index @appendix Function Index -- cgit v1.0