Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge subrepo commit '695fda0'

  • Loading branch information...
commit a0ce2bdf29898e920c9db6f82954cdbf1f8a0593 2 parents 66402a7 + 695fda0
Kent Fredric kentfredric authored
11 maint-travis-ci/.gitrepo
View
@@ -0,0 +1,11 @@
+; DO NOT EDIT (unless you know what you are doing)
+;
+; This subdirectory is a git "subrepo", and this file is maintained by the
+; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
+;
+[subrepo]
+ remote = https://github.com/kentfredric/travis-scripts.git
+ branch = master
+ commit = 7c80dffae0d7e39b20582e368d85c290429219fa
+ former = 695fda0109a62691d1a577fd8ad2027dfa4c29ad
+ cmdver = 0.1.0
2  maint-travis-ci/.perltidyrc
View
@@ -0,0 +1,2 @@
+-i 2
+-l 130
2  maint-travis-ci/install_deps.pl
View
@@ -24,6 +24,8 @@
push @params, '--dev';
}
if ( env_is( 'TRAVIS_BRANCH', 'master' ) ) {
+ cpanm( @params, 'Devel::Confess' );
+ $ENV{PERL5OPT} = '-MDevel::Confess';
cpanm( @params, 'Dist::Zilla', 'Capture::Tiny', 'Pod::Weaver' );
cpanm( @params, '--dev', 'Dist::Zilla~>5.002', 'Pod::Weaver' );
safe_exec( 'git', 'config', '--global', 'user.email', 'kentfredric+travisci@gmail.com' );
1  maint-travis-ci/script.pl
View
@@ -22,6 +22,7 @@
}
if ( env_is( 'TRAVIS_BRANCH', 'master' ) ) {
$ENV{HARNESS_OPTIONS} = 'j100:c';
+ $ENV{PERL5OPT} = '-MDevel::Confess';
safe_exec( 'dzil', 'test', '--release' );
}
else {
26 maint-travis-ci/sync_tree.pl
View
@@ -15,6 +15,10 @@ sub git_subtree {
safe_exec( 'git', 'subtree', @_ );
}
+sub git_subrepo {
+ safe_exec( 'git', 'subrepo', @_ );
+}
+
my $travis = 'https://github.com/kentfredric/travis-scripts.git';
my $prefix = 'maint-travis-ci';
@@ -48,14 +52,30 @@ sub git_subtree {
$commitish = $opts->{commit} if $opts->{has_commit};
if ( not -d -e $root->child($prefix) ) {
- git_subtree( 'add', '--squash', '--prefix=' . $prefix, $travis, $commitish );
+ if ( $ENV{"SUBREPO"} ) {
+ git_subrepo( 'clone', $travis, $prefix, '-b', $commitish );
+ }
+ else {
+ git_subtree( 'add', '--squash', '--prefix=' . $prefix, $travis, $commitish );
+ }
}
else {
- git_subtree( 'pull', '--squash', '-m', 'Synchronise git subtree maint-travis-ci', '--prefix=' . $prefix, $travis,
- $commitish );
+ if ( $ENV{"SUBREPO"} ) {
+ git_subrepo( 'pull', $prefix, '-b', $commitish );
+ }
+ else {
+
+ git_subtree(
+ 'pull', '--squash', '-m',
+ 'Synchronise git subtree maint-travis-ci',
+ '--prefix=' . $prefix,
+ $travis, $commitish
+ );
+ }
}
}
else {
+ die "NO!" if $ENV{"SUBREPO"};
git_subtree( 'push', '--prefix=' . $prefix, $opts->{push_to}, $opts->{pushas} );
}
Please sign in to comment.
Something went wrong with that request. Please try again.