From 473abcd7cf2b21284a24655973bb9a5f45293a39 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Thu, 16 Apr 2020 14:02:39 +0300 Subject: [PATCH] Deploy scripts update --- deploy/build.bat | 14 +++++--------- deploy/build.sh | 16 ++++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/deploy/build.bat b/deploy/build.bat index 57ea92d443..5d23a8438c 100644 --- a/deploy/build.bat +++ b/deploy/build.bat @@ -6,23 +6,19 @@ mkdir cloudbeaver\conf mkdir cloudbeaver\workspace mkdir cloudbeaver\web -IF EXIST build rmdir /S /Q build -mkdir build -cd build - echo "Build dbeaver application" -rem git clone --single-branch --branch release_7_0_1 https://github.com/dbeaver/dbeaver.git -git clone https://github.com/dbeaver/dbeaver.git +cd ../.. +IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git cd dbeaver +git pull call mvn clean install -cd .. +cd ../cloudbeaver/deploy echo "Build cloudbeaver server" -cd ..\..\server +cd ..\server call mvn clean package - cd ..\deploy echo "Copy server packages" diff --git a/deploy/build.sh b/deploy/build.sh index 2063d8ef43..ede83f2983 100644 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -8,22 +8,22 @@ mkdir ./cloudbeaver/conf mkdir ./cloudbeaver/workspace mkdir ./cloudbeaver/web -rm -rf build -mkdir build -cd build - echo "Build dbeaver application" -git clone https://github.com/dbeaver/dbeaver.git +cd ../.. +if [[ -f dbeaver ]] +then + git clone https://github.com/dbeaver/dbeaver.git +fi cd dbeaver +git pull mvn clean install -cd .. +cd ../cloudbeaver/deploy echo "Build cloudbeaver server" -cd ../../server +cd ../server mvn clean package - cd ../deploy echo "Copy server packages"