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

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

CI build tools

See merge request TheExperienceArchitects/Marte/marte-engine!3
parents 60b02d2c cc4350bf

.gitlab-ci.yml

+10 −5
Original line number Diff line number Diff line
@@ -11,12 +11,13 @@ stages: 
  stage: build

  image: ubuntu:bionic

  variables:

    PLATFORM: x11

    PLATFORM: ''

    EXTRA: ''

    TOOLS: 'false'

  script:

    # - scons -j64 platform=$PLATFORM bits=64 target=release_debug $EXTRA

    - scons -j64 platform=$PLATFORM tools=no bits=64 target=release_debug $EXTRA

    - scons -j64 platform=$PLATFORM tools=no bits=64 target=release $EXTRA

    # - scons -j32 platform=$PLATFORM tools=no bits=64 target=release_debug $EXTRA

    - scons -j32 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:

    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"

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

      libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev libfreetype6-dev libssl-dev libudev-dev

      libxi-dev libxrandr-dev yasm

  variables:

    PLATFORM: x11

    TOOLS: 'true'



build_windows:

  extends: .build
@@ -78,7 +82,8 @@ deploy_treasurechest: 
  image: python:3-alpine

  variables:

    TREASURECHEST_PWD: $TREASURECHEST_PWD

    PYTHONUNBUFFERED: 1

  script:

    - pip install -r gitlab-ci/requirements.txt

    - 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/*