There was a problem fetching the pipeline mini graph.
Fixed merge conflicts
Showing
- .gitignore 9 additions, 8 deletions.gitignore
- .gitlab-ci.yml 179 additions, 111 deletions.gitlab-ci.yml
- BuildServer/.gitignore 6 additions, 0 deletionsBuildServer/.gitignore
- BuildServer/Darwin/.gitignore 0 additions, 1 deletionBuildServer/Darwin/.gitignore
- BuildServer/Darwin/Scripts/run_build.sh 0 additions, 40 deletionsBuildServer/Darwin/Scripts/run_build.sh
- BuildServer/Darwin/Scripts/run_deploy.sh 0 additions, 68 deletionsBuildServer/Darwin/Scripts/run_deploy.sh
- BuildServer/Darwin/Scripts/run_tests.sh 0 additions, 24 deletionsBuildServer/Darwin/Scripts/run_tests.sh
- BuildServer/Darwin/Tools/create-dmg/.gitignore 0 additions, 1 deletionBuildServer/Darwin/Tools/create-dmg/.gitignore
- BuildServer/Debian/run_build.sh 0 additions, 26 deletionsBuildServer/Debian/run_build.sh
- BuildServer/Debian/run_tests.sh 0 additions, 29 deletionsBuildServer/Debian/run_tests.sh
- BuildServer/Docker/Builder/Ubuntu-bionic/Dockerfile_build 16 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-bionic/Dockerfile_build
- BuildServer/Docker/Builder/Ubuntu-bionic/Dockerfile_deploy 9 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-bionic/Dockerfile_deploy
- BuildServer/Docker/Builder/Ubuntu-trusty/Dockerfile_build 16 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-trusty/Dockerfile_build
- BuildServer/Docker/Builder/Ubuntu-trusty/Dockerfile_deploy 9 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-trusty/Dockerfile_deploy
- BuildServer/Docker/Builder/Ubuntu-xenial/Dockerfile_build 16 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-xenial/Dockerfile_build
- BuildServer/Docker/Builder/Ubuntu-xenial/Dockerfile_deploy 9 additions, 0 deletionsBuildServer/Docker/Builder/Ubuntu-xenial/Dockerfile_deploy
- BuildServer/Docker/Setup/Ubuntu-bionic/Dockerfile 27 additions, 0 deletionsBuildServer/Docker/Setup/Ubuntu-bionic/Dockerfile
- BuildServer/Docker/Setup/Ubuntu-trusty/Dockerfile 25 additions, 0 deletionsBuildServer/Docker/Setup/Ubuntu-trusty/Dockerfile
- BuildServer/Docker/Setup/Ubuntu-xenial/Dockerfile 25 additions, 0 deletionsBuildServer/Docker/Setup/Ubuntu-xenial/Dockerfile
- BuildServer/Docker/Setup/build.sh 4 additions, 0 deletionsBuildServer/Docker/Setup/build.sh
Loading
Please register or sign in to comment