You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@spamassassin.apache.org by "Kevin A. McGrail" <km...@apache.org> on 2018/08/20 17:20:07 UTC
Trunk Rules Question
Looking for a sanity check on this.
Rules from RuleQA are ONLY published from trunk, correct?
So rule development requires us to use plugin and version conditions to
make it so one ruleset within reason works on all modern versions of SA.
As such, on 3.4 branch, I'm moving rules and rules-extras to trunk-only
so people don't make changes in a place that really doesn't help anyone.
Then I'm adding instructions for the build process to checkout trunk and
symlink
- Rule Source is only in trunk. If you are building a branch, checkout
trunk as well and symlink it, i.e. rulesrc -> ../trunk/rulesrc/
- Rules are ONLY published from trunk. Rule development should use plugin
and version conditions to make it so one ruleset works on all modern
versions of SA. If you are building a branch, checkout trunk as well and
symlink the rules from trunk, i.e. rules -> ../trunk/rules/
I'm leaving the few rules entries in MANIFEST despite errors thrown
because it's needed for tests like sa-compile.t
Anyway, trying to streamline the release process. I'll continue testing
and commit changes when I'm sure I'm on a good path.
Dave, I'm wondering if we do masschecks with anything other than trunk?
Regards,
KAM
Re: Trunk Rules Question
Posted by "Kevin A. McGrail" <km...@apache.org>.
Ok the revisions I made might (must) break things but we can powwow on it
tomorrow.
My thoughts are that everything ruleqa and promotion based should checkout
trunk not 3.4 branch.
With my move of the rules, I expect it should now break if it does
something needing that dir.
On Mon, Aug 20, 2018, 17:40 Dave Jones <da...@apache.org> wrote:
> On 08/20/2018 03:53 PM, Kevin A. McGrail wrote:
> > On 8/20/2018 4:47 PM, Dave Jones wrote:
> >> You are correct. Only trunk is used for masscheck and ruleqa
> >> promotions so the rules do need to contain version checking.
> > OK, so 3.4 in SVN doesn't affect masscheck or ruleqa, right? Nothing
> > svn check's out that branch or anything?
> >
>
> Well that's a slightly different question. :)
>
> 1. According to my wiki notes on the Infra 2017 Notes page, the
> ~/svn/trunk/build/mkupdates/run_nightly checks out the 3.4.2 to run the
> latest rules against for the daily "promotions validated" that gets
> emailed to the dev list.
>
> 2. The nitemc sets up the staging area for the massheckers to pull down
> via rsync.
>
> https://wiki.apache.org/spamassassin/InfraNotes2017#nitemc
>
> Both items above may be fine to stay at 3.4.2 for a while but I wanted
> to point them out in case they need to be rev'd with the new release.
>
> Dave
>
Re: Trunk Rules Question
Posted by "Kevin A. McGrail" <km...@apache.org>.
Ok the revisions I made might (must) break things but we can powwow on it
tomorrow.
My thoughts are that everything ruleqa and promotion based should checkout
trunk not 3.4 branch.
With my move of the rules, I expect it should now break if it does
something needing that dir.
On Mon, Aug 20, 2018, 17:40 Dave Jones <da...@apache.org> wrote:
> On 08/20/2018 03:53 PM, Kevin A. McGrail wrote:
> > On 8/20/2018 4:47 PM, Dave Jones wrote:
> >> You are correct. Only trunk is used for masscheck and ruleqa
> >> promotions so the rules do need to contain version checking.
> > OK, so 3.4 in SVN doesn't affect masscheck or ruleqa, right? Nothing
> > svn check's out that branch or anything?
> >
>
> Well that's a slightly different question. :)
>
> 1. According to my wiki notes on the Infra 2017 Notes page, the
> ~/svn/trunk/build/mkupdates/run_nightly checks out the 3.4.2 to run the
> latest rules against for the daily "promotions validated" that gets
> emailed to the dev list.
>
> 2. The nitemc sets up the staging area for the massheckers to pull down
> via rsync.
>
> https://wiki.apache.org/spamassassin/InfraNotes2017#nitemc
>
> Both items above may be fine to stay at 3.4.2 for a while but I wanted
> to point them out in case they need to be rev'd with the new release.
>
> Dave
>
Re: Trunk Rules Question
Posted by Dave Jones <da...@apache.org>.
On 08/20/2018 03:53 PM, Kevin A. McGrail wrote:
> On 8/20/2018 4:47 PM, Dave Jones wrote:
>> You are correct. Only trunk is used for masscheck and ruleqa
>> promotions so the rules do need to contain version checking.
> OK, so 3.4 in SVN doesn't affect masscheck or ruleqa, right? Nothing
> svn check's out that branch or anything?
>
Well that's a slightly different question. :)
1. According to my wiki notes on the Infra 2017 Notes page, the
~/svn/trunk/build/mkupdates/run_nightly checks out the 3.4.2 to run the
latest rules against for the daily "promotions validated" that gets
emailed to the dev list.
2. The nitemc sets up the staging area for the massheckers to pull down
via rsync.
https://wiki.apache.org/spamassassin/InfraNotes2017#nitemc
Both items above may be fine to stay at 3.4.2 for a while but I wanted
to point them out in case they need to be rev'd with the new release.
Dave
Re: Trunk Rules Question
Posted by "Kevin A. McGrail" <km...@apache.org>.
On 8/20/2018 4:47 PM, Dave Jones wrote:
> You are correct. Only trunk is used for masscheck and ruleqa
> promotions so the rules do need to contain version checking.
OK, so 3.4 in SVN doesn't affect masscheck or ruleqa, right? Nothing
svn check's out that branch or anything?
Re: Trunk Rules Question
Posted by Dave Jones <da...@apache.org>.
You are correct. Only trunk is used for masscheck and ruleqa promotions
so the rules do need to contain version checking.
Dave
On 08/20/2018 12:20 PM, Kevin A. McGrail wrote:
> Looking for a sanity check on this.
>
> Rules from RuleQA are ONLY published from trunk, correct?
>
> So rule development requires us to use plugin and version conditions to
> make it so one ruleset within reason works on all modern versions of SA.
>
> As such, on 3.4 branch, I'm moving rules and rules-extras to trunk-only
> so people don't make changes in a place that really doesn't help anyone.
>
> Then I'm adding instructions for the build process to checkout trunk and
> symlink
>
> - Rule Source is only in trunk. If you are building a branch, checkout
> trunk as well and symlink it, i.e. rulesrc -> ../trunk/rulesrc/
>
> - Rules are ONLY published from trunk. Rule development should use plugin
> and version conditions to make it so one ruleset works on all modern
> versions of SA. If you are building a branch, checkout trunk as well and
> symlink the rules from trunk, i.e. rules -> ../trunk/rules/
>
> I'm leaving the few rules entries in MANIFEST despite errors thrown
> because it's needed for tests like sa-compile.t
>
> Anyway, trying to streamline the release process. I'll continue testing
> and commit changes when I'm sure I'm on a good path.
>
> Dave, I'm wondering if we do masschecks with anything other than trunk?
>
> Regards,
>
> KAM
>