[REL] saas-12.2 is EOL

KangOl · Aug 6, 2019 · 6186942 · 6186942
1 parent f79fa40
commit 6186942
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/_active_branches.sh b/_active_branches.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-branches=(7.0 8.0 saas-6 9.0 10.0 saas-14 saas-15 11.0 saas-11.3 12.0 saas-12.2 saas-12.3 saas-12.4 master)
+branches=(7.0 8.0 saas-6 9.0 10.0 saas-14 saas-15 11.0 saas-11.3 12.0 saas-12.3 saas-12.4 master)
 declare -A prevs
 declare -A nexts
 for i in "${!branches[@]}"; do

diff --git a/git-commit-merge b/git-commit-merge
@@ -125,16 +125,14 @@ function check_120() {
     assert_not_in_diff js,xml "\bhidden\b" "Use $(em d-none) class instead of $(em hidden)"
 }
 
-function check_saas122() {
+function check_saas123() {
     COMPAT_OK="(csv_reader|csv_writer|to_text|reraise)"
     assert_not_in_diff py \
         "(\bpycompat\.(?!$COMPAT_OK\())|(\bfrom odoo\.tools\.pycompat import (?!$COMPAT_OK(, ?)?)+)"\
         "$(em pycompat) usage found"
     assert_not_in_diff py "\btrack_(visibility|sequence)\b" "$(em "track_visibility/sequence") usage found"
     assert_not_in_diff xml "\b@class\b" "Use $(em hasclass\(\)) in xpath expression"
-}
 
-function check_saas123() {
     assert_not_in_diff js '\$\.when\('
     assert_not_in_diff js '\$\.Deferred\('
     assert_not_in_diff js '\.(done|always)\('