autobuild 1.22.0 → 1.22.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/autobuild/import/git.rb +11 -6
- data/lib/autobuild/packages/autotools.rb +1 -1
- data/lib/autobuild/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 48e8645a039ab9b7fa950f3264bc9e15a53901a82c34fef9a32e008f123b275e
|
4
|
+
data.tar.gz: e6cfbaba2cf060c25c8bced04d8577c20275d2aabbdc0aac123ed1b43a9df4a7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 490828e178d20f24bc84d819cf9ac6fb3e6880cf5b9eb938fef540e18e8023008cd467d26fac61b46f531bb7abeadaa1822fd257437a7eb36d8c23ec8dc10906
|
7
|
+
data.tar.gz: e7eb1e3bc9bfb1f59852766113cfdb981331c595a78c9ef2f7bc530a9cf3594a64f8775b498c27f9ac534296e12393011e172c79129d7abbca69cae7581f6525
|
data/lib/autobuild/import/git.rb
CHANGED
@@ -300,8 +300,10 @@ module Autobuild
|
|
300
300
|
#
|
301
301
|
# @param [Package] package
|
302
302
|
def try_resolve_remote_head_from_local(package)
|
303
|
-
ls_local_string =
|
304
|
-
|
303
|
+
ls_local_string = run_git_bare(
|
304
|
+
package, 'symbolic-ref',
|
305
|
+
"refs/remotes/#{@remote_name}/HEAD"
|
306
|
+
).first.strip
|
305
307
|
local_remote_head = ls_local_string.match("refs/remotes/#{@remote_name}/(.*)")
|
306
308
|
local_remote_head ? local_remote_head[1] : nil
|
307
309
|
rescue Autobuild::SubcommandFailed # rubocop:disable Lint/SuppressedException
|
@@ -539,8 +541,11 @@ module Autobuild
|
|
539
541
|
# @api private
|
540
542
|
#
|
541
543
|
# Set a remote up in the repositorie's configuration
|
542
|
-
def setup_remote(
|
543
|
-
|
544
|
+
def setup_remote(
|
545
|
+
package, remote_name, repository, push_to = repository,
|
546
|
+
only_local: true
|
547
|
+
)
|
548
|
+
resolve_all_branches(package, only_local: only_local) unless has_all_branches?
|
544
549
|
|
545
550
|
run_git_bare(package, 'config', '--replace-all',
|
546
551
|
"remote.#{remote_name}.url", repository)
|
@@ -576,9 +581,9 @@ module Autobuild
|
|
576
581
|
# @api private
|
577
582
|
#
|
578
583
|
# Updates the git repository's configuration for the target remote
|
579
|
-
def update_remotes_configuration(package)
|
584
|
+
def update_remotes_configuration(package, only_local: true)
|
580
585
|
each_configured_remote do |*args|
|
581
|
-
setup_remote(package, *args)
|
586
|
+
setup_remote(package, *args, only_local: only_local)
|
582
587
|
end
|
583
588
|
|
584
589
|
if local_branch
|
@@ -146,7 +146,7 @@ module Autobuild
|
|
146
146
|
FileUtils.rm_f configurestamp
|
147
147
|
end
|
148
148
|
|
149
|
-
def import(options
|
149
|
+
def import(**options)
|
150
150
|
# We force a regen after the first checkout. The issue is that
|
151
151
|
# autotools is less robust than it should, and very often it is
|
152
152
|
# better to generate the build system for the system on which we
|
data/lib/autobuild/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: autobuild
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.22.
|
4
|
+
version: 1.22.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sylvain Joyeux
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-09-
|
11
|
+
date: 2021-09-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: concurrent-ruby
|