Check for current version tags when looking for outstanding commits on a branch

Author: ayoy

lib/fastlane/plugin/ddg_apple_automation/helper/git_helper.rb

@@ -74,7 +74,13 @@ def self.untagged_commit_sha(release_branch, platform)
       end
 
       def self.release_branch_state(release_branch, platform)
-        latest_tag = `git tag --sort=-creatordate | grep '+#{platform}' | head -n 1`.chomp
+        marketing_version = extract_version_from_branch_name(release_branch)
+        if marketing_version.to_s.empty?
+          UI.user_error!("Unable to extract version from '#{release_branch}' branch name.")
+          return
+        end
+
+        latest_tag = `git tag --sort=-creatordate | grep '+#{platform}' | grep '#{marketing_version}' | head -n 1`.chomp
         latest_tag_sha = commit_sha_for_tag(latest_tag)
         release_branch_sha = `git rev-parse "origin/#{release_branch}"`.chomp
 

spec/git_helper_spec.rb

@@ -478,20 +478,22 @@ def validate_semver(version)
   end
 
   describe "#assert_branch_has_changes" do
-    subject { Fastlane::Helper::GitHelper.assert_branch_has_changes("release_branch", platform) }
+    subject { Fastlane::Helper::GitHelper.assert_branch_has_changes(release_branch, platform) }
 
+    let(:release_branch) { "release/ios/1.0.0" }
     let(:platform) { "ios" }
-    let(:version) { "1.0.0+#{platform}" }
+    let(:semver) { "1.0.0" }
+    let(:version) { "#{semver}+#{platform}" }
 
     before do
       allow(Fastlane::UI).to receive(:important)
     end
 
     context "when the release branch has no changes since the latest tag" do
       it "returns false and shows a message" do
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | head -n 1").and_return("#{version}\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | grep '#{semver}' | head -n 1").and_return("#{version}\n")
         allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"#{version}\"^{}").and_return("abc123\n")
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with('git rev-parse "origin/release_branch"').and_return("abc123\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"origin/#{release_branch}\"").and_return("abc123\n")
 
         expect(subject).to be_falsey
         expect(Fastlane::UI).to have_received(:important).with("Release branch's HEAD is already tagged. Skipping automatic release.")
@@ -500,20 +502,20 @@ def validate_semver(version)
 
     context "when the release branch has changes since the latest tag" do
       it "returns true" do
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | head -n 1").and_return("#{version}\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | grep '#{semver}' | head -n 1").and_return("#{version}\n")
         allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"#{version}\"^{}").and_return("abc123\n")
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with('git rev-parse "origin/release_branch"').and_return("def456\n")
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git diff --name-only \"#{version}\"..\"origin/release_branch\"").and_return("app/file1.rb\napp/file2.rb\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"origin/#{release_branch}\"").and_return("def456\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git diff --name-only \"#{version}\"..\"origin/#{release_branch}\"").and_return("app/file1.rb\napp/file2.rb\n")
         expect(subject).to be_truthy
       end
     end
 
     context "when changes are only in scripts or workflows" do
       it "returns false" do
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | head -n 1").and_return("#{version}\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git tag --sort=-creatordate | grep '+#{platform}' | grep '#{semver}' | head -n 1").and_return("#{version}\n")
         allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"#{version}\"^{}").and_return("abc123\n")
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with('git rev-parse "origin/release_branch"').and_return("def456\n")
-        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git diff --name-only \"#{version}\"..\"origin/release_branch\"").and_return(".github/workflows/workflow.yml\nscripts/deploy.sh\nfastlane/Fastfile\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git rev-parse \"origin/#{release_branch}\"").and_return("def456\n")
+        allow(Fastlane::Helper::GitHelper).to receive(:`).with("git diff --name-only \"#{version}\"..\"origin/#{release_branch}\"").and_return(".github/workflows/workflow.yml\nscripts/deploy.sh\nfastlane/Fastfile\n")
         expect(subject).to be_falsey
       end
     end