Deprecate the master branch
#1739
Conversation
ginkgo-bot
added
reg:build
include/ginkgo/config.hpp.in
Outdated
| #pragma message "The version tag " GKO_VERSION_TAG " is deprecated and will stop receiving updates after 2025. " \ | ||
| "Please use the main branch for the latest release, or the develop branch for the latest development updates." |
There was a problem hiding this comment.
In MSVC, you need to use #pragma message WARN( ...) from lower_trs.hpp
There was a problem hiding this comment.
Is WARN a macro from us, because it doesn't seem to be part of msvc: https://learn.microsoft.com/en-us/cpp/preprocessor/message?view=msvc-160?
There was a problem hiding this comment.
I am also checking, but do not get anything specifying WARN when we have that in the beginning.
There was a problem hiding this comment.
Maybe set the tag as master temporary to check whether it report the message on MSVC
There was a problem hiding this comment.
That's a good suggestion, thanks!
There was a problem hiding this comment.
You can see here that it does complain quite a lot: https://gitlab.com/ginkgo-project/ginkgo-public-ci/-/jobs/8557710509
MarcelKoch
force-pushed
the
deprecate-master
branch
from
507ee9d to
9d3187a
Compare
|
Yes, but the cmake variable is called However, if we really use the variable only for branch names, then I would be fine to change the message. |
MarcelKoch
force-pushed
the
deprecate-master
branch
from
9d3187a to
eb1d6c0
Compare
MarcelKoch
force-pushed
the
deprecate-master
branch
from
eb1d6c0 to
794fa83
Compare
| - if: $RUN_CI_TAG && ($STATUS_CONTEXT == "full" || $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_TAG) | ||
| - if: $RUN_CI_TAG && ($STATUS_CONTEXT == "full" || $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "develop" || $CI_COMMIT_TAG) |
There was a problem hiding this comment.
Is this intentional behavior? only run the quick test for master branch
There was a problem hiding this comment.
There should be no CI on the master anymore. We don't need to test the same commit with three pipelines.
There was a problem hiding this comment.
If so, maybe also add one to quick_test_condition
- if: $RUN_CI_TAG && $CI_COMMIT_BRANCH == "master"
when: never
ac468e2 to
4029022
Compare
MarcelKoch
force-pushed
the
deprecate-master
branch
from
4029022 to
138a353
Compare
|
Error: PR already merged! |
1 similar comment
|
Error: PR already merged! |
This PR adds warnings when the
masterbranch is used. Themasterbranch will not be updated after 2025. It will produce both CMake warnings and compiler messages (the#warningdirective is only available in c++23).The main reason for deprecating the master branch is that the release process is more complicated with the master branch. The develop and master branch have no common history, so merging develop into master will reapply every commit in develop since the 1.0 release.