Skip to content

Fixed: DEPRECATION WARNING: Git::GitExecuteError #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bastelfreak merged 7 commits into from
Jul 7, 2025
Merged

Fixed: DEPRECATION WARNING: Git::GitExecuteError #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9d373bc
Changed: lib/vanagon/component/source/git.rb
shaun-rutherford-blizzard Jul 2, 2025
577d058
Changed: lib/vanagon/project/dsl.rb
shaun-rutherford-blizzard Jul 2, 2025
680a72b
Added: CHANGELOG.md
shaun-rutherford-blizzard Jul 2, 2025
1cd8a0e
Removed: CHANGELOG entry, auto generated
shaun-rutherford-blizzard Jul 2, 2025
d22b249
Added: Check if homebrew already installed on build machine
shaun-rutherford-blizzard Jul 2, 2025
f209a56
Changed: lib/vanagon/platform/defaults/osx-14-x86_64.rb
shaun-rutherford-blizzard Jul 7, 2025
375a03b
Remove personal changes
shaun-rutherford-blizzard Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/vanagon/component/source/git.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def fetch
begin
@clone ||= ::Git.open(File.join(workdir, dirname))
@clone.fetch
rescue ::Git::GitExecuteError, ArgumentError
rescue ::Git::Error, ArgumentError
clone!
end
checkout!
Expand Down Expand Up @@ -185,7 +185,7 @@ def refs
def clone!
VanagonLogger.info "Cloning Git repo '#{log_url}'"
VanagonLogger.info "Successfully cloned '#{dirname}'" if clone
rescue ::Git::GitExecuteError
rescue ::Git::Error
raise Vanagon::InvalidRepo, "Unable to clone from '#{log_url}'"
end
private :clone!
Expand All @@ -195,7 +195,7 @@ def clone!
def checkout!
VanagonLogger.info "Checking out '#{ref}' from Git repo '#{dirname}'"
clone.checkout(ref)
rescue ::Git::GitExecuteError
rescue ::Git::Error
raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{log_url}'"
end
private :checkout!
Expand All @@ -206,7 +206,7 @@ def checkout!
# @return [String] The version of the directory according to git describe
def describe
clone.describe(ref, tags: true)
rescue ::Git::GitExecuteError
rescue ::Git::Error
VanagonLogger.info "Directory '#{dirname}' cannot be versioned by Git. Maybe it hasn't been tagged yet?"
end
private :describe
Expand Down
6 changes: 3 additions & 3 deletions lib/vanagon/project/dsl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def release_from_git
repo_object = Git.open(File.expand_path("..", @configdir))
last_tag = repo_object.describe('HEAD', { :abbrev => 0 })
release(repo_object.rev_list("#{last_tag}..HEAD", { :count => true }))
rescue Git::GitExecuteError
rescue Git::Error
VanagonLogger.error "Directory '#{File.expand_path('..', @configdir)}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
end

Expand All @@ -195,7 +195,7 @@ def release_from_git
def version_from_git
git_version = Git.open(File.expand_path("..", @configdir)).describe('HEAD', tags: true, abbrev: 9)
version(git_version.split('-').reject(&:empty?).join('.'))
rescue Git::GitExecuteError
rescue Git::Error
VanagonLogger.error "Directory '#{File.expand_path('..', @configdir)}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
end

Expand All @@ -212,7 +212,7 @@ def version_from_branch
else
fail "Can't find a version in your branch, make sure it matches <number>.<number>, like maint/1.7.0/fixing-some-bugs"
end
rescue Git::GitExecuteError => e
rescue Git::Error => e
fail "Something went wrong trying to find your git branch.\n#{e}"
end

Expand Down