Commit f3c37d46 authored by Victor Yacovlev's avatar Victor Yacovlev

Merge branch 'master' of git.niisi.ru:kumir/kumir2

parents 1ea44acf 49ba661d
......@@ -4,15 +4,15 @@ stages:
- dist
- pack
configure:unixlike:
configure:mac:
stage: configure
script:
- mkdir build
- cd build
- export PATH=$QTDIR_MAC/bin:$PATH
- cmake -DUSE_QT=5 -DCMAKE_BUILD_TYPE=Release ..
tags:
- mac
- linux
cache:
key: $CI_PIPELINE_ID
untracked: true
......@@ -59,14 +59,14 @@ build:win32:
paths:
- build/
build:unixlike:
build:mac:
stage: build
script:
- cd build
- export PATH=$QTDIR_MAC/bin:$PATH
- make
tags:
- mac
- linux
cache:
key: $CI_PIPELINE_ID
untracked: true
......@@ -129,6 +129,7 @@ dist:mac:
- mac
script:
- cd build
- export PATH=$QTDIR_MAC/bin:$PATH
- macdeployqt Kumir.app
cache:
key: $CI_PIPELINE_ID
......@@ -158,6 +159,7 @@ pack:mac:
stage: pack
script:
- cd build
- export PATH=$QTDIR_MAC/bin:$PATH
- macdeployqt Kumir.app -dmg
- mv Kumir.dmg Kumir-%CI_COMMIT_REF_NAME%-%CI_PIPELINE_ID%.dmg
cache:
......
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