Skip to content
Snippets Groups Projects
Commit 0b0dbe0d authored by Axel Hahn's avatar Axel Hahn
Browse files

- added: skip dereferenced tags in git (tags ending ^{} )

- added: modal infobox in build page if you switch the branch
- added: git uses a cache for taglist and revision infos (ttl is 5 min)
parent 60bb1266
Branches
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<link href="/deployment/bootstrap/css/bootstrap.css" rel="stylesheet"> <link href="/deployment/bootstrap/css/bootstrap.css" rel="stylesheet">
<link href="/deployment/bootstrap/css/styles.css" type="text/css" rel="stylesheet" /> <link href="/deployment/bootstrap/css/styles.css" type="text/css" rel="stylesheet" />
<script src="/deployment/bootstrap/js/jquery-1.8.0.min.js"></script> <script src="/deployment/bootstrap/js/jquery-1.8.0.min.js"></script>
<!-- <script src="/deployment/bootstrap/js/jquery-2.1.1.min.js"></script> -->
<title>IML Deployment</title> <title>IML Deployment</title>
<link rel="stylesheet" type="text/css" href="/deployment/main.css" media="screen"> <link rel="stylesheet" type="text/css" href="/deployment/main.css" media="screen">
...@@ -33,6 +34,9 @@ ...@@ -33,6 +34,9 @@
<script src="/deployment/bootstrap/js/bootstrap.min.js"></script> <script src="/deployment/bootstrap/js/bootstrap.min.js"></script>
<script src="/deployment/js/functions.js"></script> <script src="/deployment/js/functions.js"></script>
<div id="divmodal">
<div id="divmodalmessage">please wait ...</div>
</div>
</body> </body>
</html> </html>
......
...@@ -176,7 +176,7 @@ class vcs implements iVcs { ...@@ -176,7 +176,7 @@ class vcs implements iVcs {
$iTtl=300; // cache for 5 min $iTtl=300; // cache for 5 min
require_once 'cache.class.php'; require_once 'cache.class.php';
$oCache=new AhCache($this->_getNameOfCacheModule(), "RemoteBranches"); $oCache=new AhCache($this->_getNameOfCacheModule(), "RemoteBranches");
if ($oCache->isExpired() || $bForceNoCache || true){ if ($oCache->isExpired() || $bForceNoCache){
if (!file_exists($this->_sTempDir . ".git")) { if (!file_exists($this->_sTempDir . ".git")) {
$sGitCmd.='mkdir "' . $this->_sTempDir . '" && cd "' . $this->_sTempDir . '" && '; $sGitCmd.='mkdir "' . $this->_sTempDir . '" && cd "' . $this->_sTempDir . '" && ';
$sGitCmd.='git init >/dev/null && '; $sGitCmd.='git init >/dev/null && ';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment