diff --git a/.ci/debian_ci.sh b/.ci/debian_docker.sh similarity index 95% rename from .ci/debian_ci.sh rename to .ci/debian_docker.sh index c8728e7..4bdf15b 100755 --- a/.ci/debian_ci.sh +++ b/.ci/debian_docker.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [[ ${DOCKER_USER} ]]; then +if [ "${DOCKER_USER}" != "" ]; then DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION} else DOCKER_IMAGE=debian:${DEBIAN_VERSION} diff --git a/.ci/windows_ci.sh b/.ci/windows_docker.sh similarity index 100% rename from .ci/windows_ci.sh rename to .ci/windows_docker.sh diff --git a/.ci/wininstall_ci.sh b/.ci/wininstall_docker.sh similarity index 100% rename from .ci/wininstall_ci.sh rename to .ci/wininstall_docker.sh diff --git a/.gitlab/gitlab.sh b/.gitlab/gitlab.sh new file mode 100755 index 0000000..3c076ab --- /dev/null +++ b/.gitlab/gitlab.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# Install curl and lua +apt-get update -qq && \ +apt-get install -qq curl git lua5.3 openssl + +# Check if build is not tagged +if [ "${CI_COMMIT_TAG}" == "" ]; then + export EXECUTABLE_TAG=-$(git rev-parse --short HEAD) +else + export EXECUTABLE_TAG= +fi + +# Check if package code is not set +if [ "${PACKAGE_CODE}" == "" ]; then + export PACKAGE_CODE=GitLab +fi + +.ci/ci.sh diff --git a/.travis.yml b/.travis.yml index ddb2cfc..997ce78 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,32 +9,32 @@ service: matrix: include: - env: - - BUILD_SCRIPT=debian_ci.sh + - BUILD_SCRIPT=debian_docker.sh - RELEASE_LABEL="Debian 32-Bit Package" - DEBIAN_VERSION=stretch - DOCKER_USER=i386 - APT_INSTALL=clang - env: - - BUILD_SCRIPT=debian_ci.sh + - BUILD_SCRIPT=debian_docker.sh - RELEASE_LABEL="Debian 64-Bit Package" - DEBIAN_VERSION=stretch - DOCKER_USER=amd64 - APT_INSTALL=clang - env: - - BUILD_SCRIPT=windows_ci.sh + - BUILD_SCRIPT=windows_docker.sh - QT_SELECT=qt5-i686-w64-mingw32 - RELEASE_LABEL="Windows 32-Bit Portable" - env: - - BUILD_SCRIPT=windows_ci.sh + - BUILD_SCRIPT=windows_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Portable" - EXECUTABLE_ARCH=_x64 - env: - - BUILD_SCRIPT=windows_ci.sh + - BUILD_SCRIPT=windows_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - PACKAGE_CODE=Dropbox - env: - - BUILD_SCRIPT=wininstall_ci.sh + - BUILD_SCRIPT=wininstall_docker.sh - QT_SELECT=qt5-x86_64-w64-mingw32 - RELEASE_LABEL="Windows 64-Bit Installer" - os: osx diff --git a/.travis/travis.sh b/.travis/travis.sh index 68fef79..9fd2a91 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Install lua +# Install curl and lua if [ "${TRAVIS_OS_NAME}" == "linux" ]; then sudo apt-get update -qq && \ sudo apt-get install -qq curl lua5.2