X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=.gitlab-ci.yml;h=514412926cb3b9d9d138b404c55d8a7f8c014425;hb=43efcdd63b071ef5a5224fec37ebf298cfacd0f9;hp=51c1a9d5b49c40bb6162685daf66aea9b5fbf7ce;hpb=0f3d1d647d9ce7fc92c8f471be8cc6eba99146a4;p=python-musicpd.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51c1a9d..5144129 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,4 @@
+---
 image: python:latest
 
 before_script:
@@ -7,54 +8,102 @@ stages:
   - test
   - build
 
+.cache_python:
+  variables:
+    FF_USE_FASTZIP: 1  # enable faster caching/artifacting
+    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  cache:
+    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    paths:  # cache the venv and pip cache (you may opt to use just 1 of these)
+      - $PIP_CACHE_DIR
+      #- venv
+
 .test:
   stage: test
   script:
-  - pip install pytest-cov
-  - py.test -q --cov=musicpd test.py
+    - python -m venv venv
+    - source venv/bin/activate
+    - pip install pytest-cov
+    - py.test -q --cov=musicpd test.py
   only:
-    - pushes
+    changes:
+      - musicpd.py
+      - test.py
+
+test-py3.11:
+  extends:
+    - .cache_python
+    - .test
+  image: "python:3.11"
+
+test-py3.10:
+  extends:
+    - .cache_python
+    - .test
+  image: "python:3.10"
+  coverage: '/musicpd.py\s+\d+\s+\d+\s+(\d+)%/'
 
 test-py3.9:
-  extends: ".test"
+  extends:
+    - .cache_python
+    - .test
   image: "python:3.9"
-  coverage: '/musicpd.py\s+\d+\s+\d+\s+(\d+)%/'
 
 test-py3.8:
-  extends: ".test"
+  extends:
+    - .cache_python
+    - .test
   image: "python:3.8"
 
 test-py3.7:
-  extends: ".test"
+  extends:
+    - .cache_python
+    - .test
   image: "python:3.7"
 
+test-py3.6:
+  extends:
+    - .cache_python
+    - .test
+  image: "python:3.6"
+
 
 build:
   stage: build
+  extends:
+    - .cache_python
   script:
-  # packaging test
-  - python setup.py bdist_wheel sdist
-  - pip install dist/*.whl
-  - pip install twine
-  - twine check dist/*
+    - python -m venv venv
+    - source venv/bin/activate
+    - pip install build
+    # packaging test
+    - python3 -m build -s -w
+    - pip install dist/*.whl
+    - pip install twine
+    - twine check dist/*
   artifacts:
     expire_in: 1 week
     paths:
-    - dist/*.whl
-    - dist/*.tar.gz
-    - dist/*.zip
+      - dist/*.whl
+      - dist/*.tar.gz
+      - dist/*.zip
   only:
     - pushes
 
 tag_release:
   stage: build
+  extends:
+    - .cache_python
   script:
-  - python setup.py bdist_wheel sdist
+    - python -m venv venv
+    - source venv/bin/activate
+    - pip install build
+    - python3 -m build -s -w
   artifacts:
     paths:
-    - dist/*.whl
-    - dist/*.tar.gz
-    - dist/*.zip
+      - dist/*.whl
+      - dist/*.tar.gz
+      - dist/*.zip
     name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG"
   only:
     - tags
@@ -62,10 +111,10 @@ tag_release:
 pages:
   stage: build
   script:
-  - pip install sphinx sphinx_rtd_theme
-  - sphinx-build -d ./build/doctrees doc/source -b html ./public -D html_theme=sphinx_rtd_theme
+    - pip install sphinx sphinx_rtd_theme
+    - sphinx-build -d ./build/doctrees doc/source -b html ./public -D html_theme=sphinx_rtd_theme
   artifacts:
     paths:
-    - public
+      - public
   only:
-  - master
+    - master