diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..6dfe4b3 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,49 @@ +def remote = [:] +remote.name = 'workstation' +remote.host = 'workstation' +remote.user = 'dany' +remote.identityFile = '/var/jenkins_home/.ssh/id_rsa' +remote.allowAnyHosts = true +remote.agent = false +remote.logLevel = 'INFO' +pipeline{ + agent { node{ label'master' }} + options { + // Limit build history with buildDiscarder option: + // daysToKeepStr: history is only kept up to this many days. + // numToKeepStr: only this many build logs are kept. + // artifactDaysToKeepStr: artifacts are only kept up to this many days. + // artifactNumToKeepStr: only this many builds have their artifacts kept. + buildDiscarder(logRotator(numToKeepStr: "1")) + // Enable timestamps in build log console + timestamps() + // Maximum time to run the whole pipeline before canceling it + timeout(time: 1, unit: 'HOURS') + // Use Jenkins ANSI Color Plugin for log console + ansiColor('xterm') + // Limit build concurrency to 1 per branch + disableConcurrentBuilds() + } + stages + { + stage('Build') { + steps { + sshCommand remote: remote, command: ''' + set -e + export WORKSPACE=$(realpath "./jenkins/workspace/antd-web-apps") + cd $WORKSPACE + [ -d build ] && rm -rf build + mkdir -p build/opt/www/htdocs + export BUILDDIR="$WORKSPACE/build/opt/www/htdocs" + make + ''' + script { + // only useful for any master branch + //if (env.BRANCH_NAME =~ /^master/) { + archiveArtifacts artifacts: 'build/', fingerprint: true + //} + } + } + } + } +} diff --git a/README.md b/README.md index f8f9e9d..8d59fa5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # antd-web-apps -Some web apps for antd server +Various web apps for antd server diff --git a/blog/views/default/layout.ls b/blog/views/default/layout.ls index c6dbb48..a2e2830 100644 --- a/blog/views/default/layout.ls +++ b/blog/views/default/layout.ls @@ -152,7 +152,7 @@
- Powered by antd server, (c) 2017 - Xuan Sang LE + Powered by antd server, (c) 2017 - Dany LE
diff --git a/dist/antd_web_apps.tar.gz b/dist/antd_web_apps.tar.gz index 8eef4ce..b78257f 100644 Binary files a/dist/antd_web_apps.tar.gz and b/dist/antd_web_apps.tar.gz differ diff --git a/info/router.lua b/info/router.lua index 17de4fa..6ada572 100644 --- a/info/router.lua +++ b/info/router.lua @@ -26,7 +26,7 @@ require(BASE_FRW.."silk.api") local REGISTRY = {} -- set logging level REGISTRY.logger = Logger:new{ levels = {INFO = false, ERROR = true, DEBUG = false}} -REGISTRY.users_allowed = { phuong = true, mrsang = true } +REGISTRY.users_allowed = { phuong = true, mrsang = true, dany = true } REGISTRY.user = "mrsang" REGISTRY.db = DBHelper:new{db=REGISTRY.user} REGISTRY.layout = 'default'