aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoroldmud0 <3421260-oldmud0@users.noreply.gitlab.com>2019-02-06 22:50:14 +0000
committeroldmud0 <3421260-oldmud0@users.noreply.gitlab.com>2019-02-06 22:50:14 +0000
commit565f18352424d89ef0ab02ec9b3a12b5c7e703be (patch)
treec4944e22bae4377da3b983b1e0ce1243ffecbf8a
parent72dbc4f3ae160d273649f6596ee12221f47a4003 (diff)
Remove version commands from before_script
-rw-r--r--.gitlab-ci.yml23
1 files changed, 17 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 198ceab1..f8974a06 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,13 +5,7 @@ cache:
before_script:
- echo Current working directory is $(pwd)
- - echo Current user is $(whoami)
- - qmake --version
- - gcc --version
- sudo apt-get install --no-install-recommends -y upx zip unzip
- - cd scripts
- - ./configure_ubuntu.sh
- - cd ..
build linux x86_64:
image: rabits/qt:5.9-desktop
@@ -20,6 +14,13 @@ build linux x86_64:
- docker
- linux
script:
+ - qmake --version
+ - gcc --version
+
+ - cd scripts
+ - ./configure_ubuntu.sh
+ - cd ..
+
- qmake
- make -j4
- upx --lzma -9 --force bin/Attorney_Online
@@ -34,8 +35,18 @@ build windows i686:
- docker
- linux
script:
+ # Extract BASS
+ - mkdir bass
+ - curl http://www.un4seen.com/files/bass24.zip -o bass.zip
+ - unzip bass.zip
+ - cp bass.dll ../../lib
+ - cd ..
+
+ # Build
- qmake
- make -j4
+
+ # Post-processing
- upx --lzma -9 --force bin/Attorney_Online.exe
# Base folder