Skip to content

Commit

Permalink
Merge pull request #501
Browse files Browse the repository at this point in the history
* pr-501:
  changed package name to yawik/yawik
  fixed branch alias
  [Core] fixed do not check version with git when in vendor directory
  [Install] disabled loading modules automatically by zf installer
  • Loading branch information
TiSiE committed Nov 6, 2018
2 parents 9154633 + 5883b83 commit df23988
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "yawik/development",
"name": "yawik/yawik",
"type": "project",
"description": "Web based applicant tracking system for managing jobs and applications",
"authors": [
Expand Down Expand Up @@ -158,7 +158,6 @@
},
"extra": {
"branch-alias": {
"dev-develop": "0.33-dev",
"dev-master": "0.32-dev"
}
}
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions module/Core/src/Yawik.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ public static function init()
$dotenv = new Dotenv();
$dotenv->load($env);
}
$version = getenv('TRAVIS') ? "undefined":exec('git describe');
$branch = getenv('TRAVIS') ? "undefined":exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
$isVendor = strpos(__FILE__, 'modules')!==false || strpos(__FILE__, 'vendor') !== false;
$version = getenv('TRAVIS') || $isVendor ? "undefined":exec('git describe');
$branch = getenv('TRAVIS') || $isVendor ? "undefined":exec('git rev-parse --abbrev-ref HEAD', $output, $retVal);
static::$VERSION = $version.'['.$branch.']';
}

Expand Down
3 changes: 0 additions & 3 deletions module/Install/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
"extra": {
"branch-alias": {
"dev-develop": "0.32-dev"
},
"zf": {
"module": "Install"
}
}
}

0 comments on commit df23988

Please sign in to comment.