Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
franzlst committed Mar 4, 2022
2 parents 9897790 + 30ffb59 commit 59e4f46
Show file tree
Hide file tree
Showing 1,160 changed files with 112,670 additions and 2,301 deletions.
9 changes: 9 additions & 0 deletions .coveragerc
@@ -0,0 +1,9 @@
[run]

source=
source/rafcon

omit =
*__init__*
*/usr/local/lib*
*/test*
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -50,11 +50,13 @@ pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
htmlcov_core/
.tox/
.coverage
.cache
nosetests.xml
coverage.xml
coverage_core.xml

# Translations
*.mo
Expand Down
108 changes: 108 additions & 0 deletions .gitlab-ci.yml
@@ -0,0 +1,108 @@
include:
- project: 'dev/sys/sopl/ar-dev'
# release branch
ref: 'release/3.x'
file:
- '/ci/templates/default.yml'

variables:
AR_CI_CLANG_FORMAT_DISABLE: "true"
AR_CI_CLANG_TIDY_DISABLE: "true"
AR_CI_CPPCHECK_DISABLE: "true"
AR_CI_FLAKE8_DISABLE: "true"
AR_CI_YAPF_DISABLE: "true"
AR_CI_DOCS_DISABLE: "false"
AR_CI_DEPLOY_CONAN_DISABLE: "true"

# From https://docs.gitlab.com/ee/ci/merge_request_pipelines/#excluding-certain-jobs
.only-default: &only-default
only:
# only: [branches, tags] is the default
# extend it by merge_reguests
# and limit branches to master and release/*
# See also: https://docs.gitlab.com/ee/ci/yaml/#onlyexcept-basic
- master
- develop
- /^release/.*$
- /^release.*$
- tags
- merge_requests

docs_test:
extends: .docs_test
variables:
BUILD_DIR: build
CONAN_OPTIONS: ""
MAKE_CMD_DOCS: "make docs"

pages:
extends: .docs_pages
variables:
BUILD_DIR: build
CONAN_OPTIONS: ""
MAKE_CMD_DOCS: "make docs"
except:
variables:
- $AR_CI_DOCS_DISABLE == "true"

test py2-tests:
<<: *only-default
stage: Test
tags:
- Agile_GUI_Docker
script:
- pip2 install --user --force "pytest>=3.5,<5" lazy-object-proxy==1.5.0 PyYAML==5.1 yaml-configuration==0.2.5
- pip2 install pytest-runner==5.2 # this is py2 compatible, ver 5.3 is not
- xvfb-run -as "-screen 0 1920x1200x24" python2 setup.py pytest --addopts '-vx -m "(core or gui) and not unstable and not user_input"'

test py3-tests:
<<: *only-default
stage: Test
tags:
- Agile_GUI_Docker
script:
- pip3 install tox
- xvfb-run -as "-screen 0 1920x1200x24" tox -r -c tox_external.ini -e py36
coverage: /^TOTAL.+?(\d+\%)$/
artifacts:
expire_in: 7 days
reports:
cobertura: coverage.xml
paths:
- coverage.xml
- htmlcov/*

test py3-tests-core:
<<: *only-default
stage: Test
tags:
- Agile_GUI_Docker
script:
- pip3 install tox
- xvfb-run -as "-screen 0 1920x1200x24" tox -r -c tox_external.ini -e core
coverage: /^TOTAL.+?(\d+\%)$/
artifacts:
expire_in: 7 days
reports:
cobertura: coverage_core.xml
paths:
- coverage_core.xml
- htmlcov_core/*


test py3-memory-test-core:
<<: *only-default
stage: Test
tags:
- Agile_GUI_Docker
script:
- pip3 install tox
- xvfb-run -as "-screen 0 1920x1200x24" tox -r -c tox_external.ini -e memory_core
artifacts:
expire_in: 7 days


# running pytest directly does not work
# as the test_start_script.py test_start_script_valid_config always uses "python" to start "rafcon_core"
# which fails if tests are run using python3 as the "python" always maps to python2 on Ubuntu 18.04
# - xvfb-run -as "-screen 0 1920x1200x24" python3 setup.py pytest --addopts '-vx -m "(core or gui) and not unstable and not user_input"'
2 changes: 1 addition & 1 deletion .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions .idea/runConfigurations/Start_GUI.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 59e4f46

Please sign in to comment.