From 5a34b6aadf332c9e4e550bdfc621d1bc68117d1e Mon Sep 17 00:00:00 2001 From: Dushy Date: Fri, 16 Feb 2018 14:39:20 +0100 Subject: [PATCH 1/2] Added a branch to deploy from, close #13 --- deployNewVersion.php | 14 ++++++++++++-- updatePanel.php | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/deployNewVersion.php b/deployNewVersion.php index 679ae89..ddf294c 100644 --- a/deployNewVersion.php +++ b/deployNewVersion.php @@ -1,8 +1,12 @@ &1'); + $branch = $_POST['branch']; + if($branch == "") { + $branch = "master"; + } + $output = shell_exec(dirname(__DIR__) . '/deploy.sh --release "'.$branch.'" 2>&1'); $error = $output; - $message = "New version deployed."; + $message = "New version deployed. (branch : $branch)"; } ?> @@ -36,6 +40,12 @@
Deploy new version +
+ +
+ +
+
Get back to the panel diff --git a/updatePanel.php b/updatePanel.php index 69cee58..9380b32 100644 --- a/updatePanel.php +++ b/updatePanel.php @@ -1,8 +1,12 @@ &1'); + $branch = $_POST['branch']; + if($branch == "") { + $branch = "master"; + } + $output = shell_exec(dirname(__DIR__) . '/deploy.sh --panel "'.$branch.'" 2>&1'); $error = $output; - $message = "New version of admin panel deployed."; + $message = "New version of admin panel deployed. (branch : $branch)"; } ?> @@ -36,6 +40,12 @@
Update Admin panel +
+ +
+ +
+
Get back to the panel From c7c82127452d26172e5f24509e41cbea4d04f035 Mon Sep 17 00:00:00 2001 From: Dushy Date: Fri, 16 Feb 2018 14:48:46 +0100 Subject: [PATCH 2/2] Script replace default itself --- deployNewVersion.php | 5 +---- updatePanel.php | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/deployNewVersion.php b/deployNewVersion.php index ddf294c..f705479 100644 --- a/deployNewVersion.php +++ b/deployNewVersion.php @@ -1,12 +1,9 @@ &1'); $error = $output; - $message = "New version deployed. (branch : $branch)"; + $message = "New version deployed."; } ?> diff --git a/updatePanel.php b/updatePanel.php index 9380b32..ec51e16 100644 --- a/updatePanel.php +++ b/updatePanel.php @@ -1,12 +1,9 @@ &1'); $error = $output; - $message = "New version of admin panel deployed. (branch : $branch)"; + $message = "New version of admin panel deployed."; } ?>