Commit 5f9dfc16 authored by Matteo De Carlo's avatar Matteo De Carlo

Merge branch 'dev/ci' into 'dev/common'

CI build tools

See merge request TheExperienceArchitects/Marte/marte-engine!3
parents 60b02d2c cc4350bf
...@@ -11,12 +11,13 @@ stages: ...@@ -11,12 +11,13 @@ stages:
stage: build stage: build
image: ubuntu:bionic image: ubuntu:bionic
variables: variables:
PLATFORM: x11 PLATFORM: ''
EXTRA: '' EXTRA: ''
TOOLS: 'false'
script: script:
# - scons -j64 platform=$PLATFORM bits=64 target=release_debug $EXTRA # - scons -j32 platform=$PLATFORM tools=no bits=64 target=release_debug $EXTRA
- scons -j64 platform=$PLATFORM tools=no bits=64 target=release_debug $EXTRA - scons -j32 platform=$PLATFORM tools=no bits=64 target=release $EXTRA
- scons -j64 platform=$PLATFORM tools=no bits=64 target=release $EXTRA - if $TOOLS; then scons -j32 platform=$PLATFORM tools=yes bits=64 target=release_debug $EXTRA; fi
artifacts: artifacts:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
paths: paths:
...@@ -28,6 +29,9 @@ build_ubuntu: ...@@ -28,6 +29,9 @@ build_ubuntu:
- apt-get update -qq && apt-get install -y -qq build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev - apt-get update -qq && apt-get install -y -qq build-essential scons pkg-config libx11-dev libxcursor-dev libxinerama-dev
libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libfreetype6-dev libssl-dev libudev-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libfreetype6-dev libssl-dev libudev-dev
libxi-dev libxrandr-dev yasm libxi-dev libxrandr-dev yasm
variables:
PLATFORM: x11
TOOLS: 'true'
build_windows: build_windows:
extends: .build extends: .build
...@@ -78,7 +82,8 @@ deploy_treasurechest: ...@@ -78,7 +82,8 @@ deploy_treasurechest:
image: python:3-alpine image: python:3-alpine
variables: variables:
TREASURECHEST_PWD: $TREASURECHEST_PWD TREASURECHEST_PWD: $TREASURECHEST_PWD
PYTHONUNBUFFERED: 1
script: script:
- pip install -r gitlab-ci/requirements.txt - pip install -r gitlab-ci/requirements.txt
- ls -la bin/ - ls -la bin/
- python gitlab-ci/upload_treasurechest.py bin/* #bin/godot.windows.opt.64.exe bin/godot.x11.opt.64 bin/godot.osx.opt.64 - python gitlab-ci/upload_treasurechest.py bin/*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment