AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge PR #657: gitlab-ci: refactoring

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-17 21:56:59 +02:00 committed by GitHub
commit 088ed37d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@ -1,9 +1,11 @@
.ubuntu: &ubuntu_def .ubuntu: &ubuntu_def
variables:
CMAKE_VERSION: 3.12.1
before_script: before_script:
- REPOSITORY="$PWD" && cd .. - REPOSITORY="$PWD" && cd ..
- apt-get update && apt-get install -y wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file - apt-get update && apt-get install -y dpkg-dev wget g++ gcc libncurses5-dev libreadline-dev libssl-dev make zlib1g-dev git file
- wget https://cmake.org/files/v3.12/cmake-3.12.1.tar.gz && tar -xzvf cmake-3.12.1.tar.gz - wget https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}.tar.gz && tar -xzf cmake-${CMAKE_VERSION}.tar.gz
- cd cmake-3.12.1 && ./bootstrap && make install - cd cmake-${CMAKE_VERSION} && ./bootstrap && make install
- cd "$REPOSITORY" && git submodule update --init --recursive - cd "$REPOSITORY" && git submodule update --init --recursive
script: script:
- ./configure - ./configure
@ -12,21 +14,14 @@
bionic: bionic:
<<: *ubuntu_def <<: *ubuntu_def
image: ubuntu:bionic image: ubuntu:bionic
variables:
CMAKE: cmake
xenial: xenial:
<<: *ubuntu_def <<: *ubuntu_def
image: ubuntu:xenial image: ubuntu:xenial
variables:
CMAKE: cmake
trusty: trusty:
<<: *ubuntu_def <<: *ubuntu_def
image: ubuntu:trusty image: ubuntu:trusty
variables:
CMAKE: cmake3
# #
# there's no cmake3 for 12.04 # there's no cmake3 for 12.04
@ -35,6 +30,4 @@ trusty:
#precise: #precise:
# <<: *ubuntu_def # <<: *ubuntu_def
# image: ubuntu:precise # image: ubuntu:precise
# variables:
# CMAKE: cmake3

6
configure vendored
View File

@ -35,11 +35,11 @@ if [ -z ${OPENSSL_ROOT_DIR} ]; then
fi fi
fi fi
if [ -x "$(command -v rpmbuild)" ]; then if [ -x "$(command -v rpm)" ]; then
echo "'rpmbuild' executable found, CPack will generate RPM packages." echo "'rpm' executable found, CPack will generate RPM packages."
CMAKE_FLAGS="-DCPACK_GENERATOR='RPM' ${CMAKE_FLAGS}" CMAKE_FLAGS="-DCPACK_GENERATOR='RPM' ${CMAKE_FLAGS}"
else else
echo "'rpmbuild' executable not found, CPack will generate DEB packages." echo "'rpm' executable not found, CPack will generate DEB packages."
CMAKE_FLAGS="-DCPACK_GENERATOR='DEB' ${CMAKE_FLAGS}" CMAKE_FLAGS="-DCPACK_GENERATOR='DEB' ${CMAKE_FLAGS}"
fi fi