diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd08a90d..f86b7d16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,15 +108,6 @@ tests: coverage_format: cobertura path: coverage.xml -#tests-3.10-pyqt5: #todo enable when we decide what qt distributions we want to support -# extends: "tests" -# stage: AdditionalTests -# image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10 -# script: -# - apt-get update -# - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3 -# - pip install .[dev,pyqt5] -# - pytest -v --random-order ./tests tests-3.11: extends: "tests" @@ -202,7 +193,7 @@ semver: allow_failure: false rules: - - if: '$CI_COMMIT_REF_NAME == "master"' + - if: '$CI_COMMIT_REF_NAME == "main"' pages: stage: Deploy @@ -213,6 +204,6 @@ pages: - if: '$CI_COMMIT_TAG != null' variables: TARGET_BRANCH: $CI_COMMIT_TAG - - if: '$CI_COMMIT_REF_NAME == "master"' + - if: '$CI_COMMIT_REF_NAME == "main"' script: - curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/bec-widgets/253243/