From ae14e4b2f4dcf57ec2eec5ab04868c54f3506050 Mon Sep 17 00:00:00 2001 From: denverwilliams Date: Wed, 13 Jan 2021 17:24:23 -0500 Subject: [PATCH] skip_snap_shot_branch now checked with current_branch and detached head cncf/cnf-conformance#527 --- src/tasks/utils/release_manager.cr | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tasks/utils/release_manager.cr b/src/tasks/utils/release_manager.cr index 60fa453f2..1d83266a3 100644 --- a/src/tasks/utils/release_manager.cr +++ b/src/tasks/utils/release_manager.cr @@ -40,10 +40,13 @@ module ReleaseManager LOGGING.info "upsert_version comparison: upsert_version =~ /(?i)(master|v[0-9]|test_version)/ : #{upsert_version =~ /(?i)(master|v[0-9]|test_version)/}" #master-381d20d invalid_version = !(upsert_version =~ /(?i)(master|v[0-9]|test_version)/) + snap_shot_version = (upsert_version =~ /(?i)(master-)/) + head = (ReleaseManager.current_branch == "HEAD") + skip_snapshot_detached_head = (head && snap_shot_version) LOGGING.info "invalid_version: #{invalid_version}" - skip_snap_shot_branch = (ReleaseManager.current_branch =~ /(?i)(master-)/) - LOGGING.info "skip_snap_shot_branch: #{skip_snap_shot_branch}" - if skip_snap_shot_branch || invalid_version + LOGGING.info "current_branch: #{ReleaseManager.current_branch}" + LOGGING.info "skip_snapshot_detached_head: #{skip_snapshot_detached_head}" + if skip_snapshot_detached_head || invalid_version LOGGING.info "Not creating a release for : #{upsert_version}" return {found_release, asset} end