Skip to content

Commit

Permalink
Merge pull request #59 from katalon-studio/gradle
Browse files Browse the repository at this point in the history
Gradle
  • Loading branch information
devalex88 authored May 9, 2019
2 parents e714788 + bff8e5d commit 8d9779d
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 347 deletions.
5 changes: 5 additions & 0 deletions base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ ENV KATALON_MAKE_EXECUTABLE_SCRIPT=$KATALON_BASE_ROOT_DIR/make_executable.sh
ENV KATALON_CLEAN_UP_SCRIPT=$KATALON_BASE_ROOT_DIR/cleanup.sh
ENV KATALON_VERSION_FILE=/katalon/version

ENV GRADLE_HOME=/opt/gradle
ENV GRADLE_BIN=$GRADLE_HOME/bin

ENV DISPLAY=:99
ENV DISPLAY_CONFIGURATION=1024x768x24

Expand All @@ -22,4 +25,6 @@ RUN ./index.sh

RUN $KATALON_CLEAN_UP_SCRIPT

ENV PATH "$PATH:$GRADLE_BIN"

WORKDIR /
1 change: 1 addition & 0 deletions base/src/index.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ setup/xvfb.sh
setup/jre.sh
setup/circleci-tools.sh
setup/fonts.sh
setup/gradle.sh
19 changes: 19 additions & 0 deletions base/src/setup/gradle.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

set -xe

echo "Install Gradle"
version=5.4.1
package=gradle-$version-bin.zip
unzipped_package=gradle-$version

wget https://downloads.gradle.org/distributions/gradle-$version-bin.zip
ls
unzip $package
ls
rm $package

mv $unzipped_package $GRADLE_HOME
ls $GRADLE_HOME

mkdir -p ~/.gradle && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
7 changes: 7 additions & 0 deletions katalon/src/scripts/katalon-execute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ mkdir -p $project_dir

cp -r $source_dir/* $project_dir

# download dependencies
cd $project_dir
if [ -f "$project_dir/build.gradle" ]; then
gradle --console=plain katalonCopyDependencies
fi
cd $current_dir

# create .classpath if not exist
touch $project_dir/.classpath || exit
chmod -R 777 $project_dir
Expand Down
3 changes: 2 additions & 1 deletion katalon/src/setup/katalon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ set -xe

echo "Install Katalon"

version=6.1.2
version=6.1.3
directory=$version
package=Katalon_Studio_Linux_64-$version.tar.gz
unzipped_directory=Katalon_Studio_Linux_64-$version

wget -O $package https://github.com/katalon-studio/katalon-studio/releases/download/v$version/Katalon_Studio_Linux_64-$version.tar.gz
ls
tar -xvzf $package -C $KATALON_KATALON_INSTALL_DIR_PARENT
ls
rm $package
Expand Down
7 changes: 5 additions & 2 deletions test/project/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@
/Libs/
/.settings/
/.classpath
.svn/
/Reports
/.svn/
/Reports
/Drivers
/.project
/.gradle
Loading

0 comments on commit 8d9779d

Please sign in to comment.