Syping/gta5view
1
0
Fork 0
Code Issues Pull requests Releases 12 Wiki Activity

rename some CI scripts and add GitLab main script

Browse source
This commit is contained in:
Syping 2018-06-22 17:25:27 +02:00
parent e2b7062e26
commit 0321d79136
6 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/debian_ci.sh → .ci/debian_docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [[ ${DOCKER_USER} ]]; then if [ "${DOCKER_USER}" != "" ]; then
DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION} DOCKER_IMAGE=${DOCKER_USER}/debian:${DEBIAN_VERSION}
else else
DOCKER_IMAGE=debian:${DEBIAN_VERSION} DOCKER_IMAGE=debian:${DEBIAN_VERSION}

0
.ci/windows_ci.sh → .ci/windows_docker.sh
View file

0
.ci/wininstall_ci.sh → .ci/wininstall_docker.sh
View file

19
.gitlab/gitlab.sh Executable file
View file

@ -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

12
.travis.yml
View file

@ -9,32 +9,32 @@ service:
matrix: matrix:
include: include:
- env: - env:
- BUILD_SCRIPT=debian_ci.sh - BUILD_SCRIPT=debian_docker.sh
- RELEASE_LABEL="Debian 32-Bit Package" - RELEASE_LABEL="Debian 32-Bit Package"
- DEBIAN_VERSION=stretch - DEBIAN_VERSION=stretch
- DOCKER_USER=i386 - DOCKER_USER=i386
- APT_INSTALL=clang - APT_INSTALL=clang
- env: - env:
- BUILD_SCRIPT=debian_ci.sh - BUILD_SCRIPT=debian_docker.sh
- RELEASE_LABEL="Debian 64-Bit Package" - RELEASE_LABEL="Debian 64-Bit Package"
- DEBIAN_VERSION=stretch - DEBIAN_VERSION=stretch
- DOCKER_USER=amd64 - DOCKER_USER=amd64
- APT_INSTALL=clang - APT_INSTALL=clang
- env: - env:
- BUILD_SCRIPT=windows_ci.sh - BUILD_SCRIPT=windows_docker.sh
- QT_SELECT=qt5-i686-w64-mingw32 - QT_SELECT=qt5-i686-w64-mingw32
- RELEASE_LABEL="Windows 32-Bit Portable" - RELEASE_LABEL="Windows 32-Bit Portable"
- env: - env:
- BUILD_SCRIPT=windows_ci.sh - BUILD_SCRIPT=windows_docker.sh
- QT_SELECT=qt5-x86_64-w64-mingw32 - QT_SELECT=qt5-x86_64-w64-mingw32
- RELEASE_LABEL="Windows 64-Bit Portable" - RELEASE_LABEL="Windows 64-Bit Portable"
- EXECUTABLE_ARCH=_x64 - EXECUTABLE_ARCH=_x64
- env: - env:
- BUILD_SCRIPT=windows_ci.sh - BUILD_SCRIPT=windows_docker.sh
- QT_SELECT=qt5-x86_64-w64-mingw32 - QT_SELECT=qt5-x86_64-w64-mingw32
- PACKAGE_CODE=Dropbox - PACKAGE_CODE=Dropbox
- env: - env:
- BUILD_SCRIPT=wininstall_ci.sh - BUILD_SCRIPT=wininstall_docker.sh
- QT_SELECT=qt5-x86_64-w64-mingw32 - QT_SELECT=qt5-x86_64-w64-mingw32
- RELEASE_LABEL="Windows 64-Bit Installer" - RELEASE_LABEL="Windows 64-Bit Installer"
- os: osx - os: osx

2
.travis/travis.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Install lua # Install curl and lua
if [ "${TRAVIS_OS_NAME}" == "linux" ]; then if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
sudo apt-get update -qq && \ sudo apt-get update -qq && \
sudo apt-get install -qq curl lua5.2 sudo apt-get install -qq curl lua5.2