changelog

.circleci/config.yml

@@ -395,9 +395,11 @@ jobs:
       - run:
           name: Check Changelog
           command: |-
-            if [ -z "${CIRCLE_PULL_REQUEST##*/}" ]
+            if [ -z "${CIRCLE_PULL_REQUEST}" ]
             then
-            ./scripts/changelog-check -b ${CIRCLE_BRANCH} -s main
+              exit 0
+            else
+              ./scripts/changelog-check -b "${CIRCLE_BRANCH}" -s main
             fi
 
 workflows:

scripts/changelog-check

@@ -4,7 +4,6 @@ require 'optparse'
 
 # [skip_changelog]
 
-
 CHANGELOG_REGEX = %r{^\+- (?<category>[\w ]+{2,}): (?<change>[\w\s]+{2,})}
 # A valid diff line is in the form of:
 # +- CATEGORY: CHANGE DESCRIPTION
@@ -14,13 +13,16 @@ def is_valid_changelog_diff_addition?(line)
 end
 
 def get_changelog_diff_lines(base_branch, source_branch)
-  diff, status = Open3.capture2('git', 'diff', '--merge-base', base_branch, source_branch, 'CHANGELOG.md')
-  raise "git diff failed" unless status.success?
+  diff, status = Open3.capture2(
+    'git', 'diff', '--merge-base', base_branch, source_branch,
+    'CHANGELOG.md'
+  )
+  raise 'git diff failed' unless status.success?
 
   diff_lines = diff.chomp.split("\n")
-  index = diff_lines.find_index { |line| line.start_with?("@@") }
+  index = diff_lines.find_index { |line| line.start_with?('@@') }
   return [] if index.nil?
-  diff_lines[(index+1)..].filter { |line| !line.start_with?("@@") && line != " " }
+  diff_lines[(index+1)..].filter { |line| !line.start_with?('@@') && line != ' ' }
 end
 
 def main(args)
@@ -33,7 +35,7 @@ def main(args)
 
     EOM
     opts.on('-h', '--help', 'Display this message') do
-      STDERR.puts opts
+      warn opts
       exit
     end
 
@@ -48,9 +50,7 @@ def main(args)
 
   optparse.parse!
 
-  if options[:source_branch].nil?
-    abort(optparse.help)
-  end
+  abort(optparse.help) if options[:source_branch].nil?
 
   diff_lines = get_changelog_diff_lines(options[:base_branch], options[:source_branch])
 
@@ -61,6 +61,4 @@ def main(args)
   end
 end
 
-if __FILE__ == $0
-  main(ARGV)
-end
+main(ARGV) if __FILE__ == $0