This is an automated email from the ASF dual-hosted git repository.

kou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 717a851b1b GH-38363: [Release][CI] Omit tests for main/maintenance 
branches on RC branch (#38365)
717a851b1b is described below

commit 717a851b1bd9a79ec8923b0d82ad85caa45b7d49
Author: Sutou Kouhei <[email protected]>
AuthorDate: Fri Oct 20 10:46:12 2023 +0900

    GH-38363: [Release][CI] Omit tests for main/maintenance branches on RC 
branch (#38365)
    
    ### Rationale for this change
    
    Tests of deb package names for the following patterns are only for 
main/maintenance branches:
    
    * `dev/release/post-11-bump-versions.sh 14.1.0 15.0.0` (minor release -> 
major release)
    * `dev/release/post-11-bump-versions.sh 14.0.1 15.0.0` (patch release -> 
major release)
    
    ### What changes are included in this PR?
    
    Omit these patterns.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #38363
    
    Authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Sutou Kouhei <[email protected]>
---
 dev/release/post-11-bump-versions-test.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/release/post-11-bump-versions-test.rb 
b/dev/release/post-11-bump-versions-test.rb
index a017d2d70a..4b6933d610 100644
--- a/dev/release/post-11-bump-versions-test.rb
+++ b/dev/release/post-11-bump-versions-test.rb
@@ -54,12 +54,12 @@ class PostBumpVersionsTest < Test::Unit::TestCase
     end
     env = env.merge(additional_env)
     case bump_type
-    when :minor_on_main, :patch_on_main
+    when :minor, :patch
       previous_version_components = @previous_version.split(".")
       case bump_type
-      when :minor_on_main
+      when :minor
         previous_version_components[1].succ!
-      when :patch_on_main
+      when :patch
         previous_version_components[2].succ!
       end
       sh(env,
@@ -323,8 +323,9 @@ class PostBumpVersionsTest < Test::Unit::TestCase
                  "Output:\n#{stdout}")
   end
 
-  data(:bump_type, [nil, :minor_on_main, :patch_on_main])
+  data(:bump_type, [nil, :minor, :patch])
   def test_deb_package_names
+    omit_on_release_branch unless bump_type.nil?
     current_commit = git_current_commit
     stdout = bump_versions("DEB_PACKAGE_NAMES")
     changes = parse_patch(git("log", "-p", "#{current_commit}.."))

Reply via email to