feat: improve circle ci

.circleci/config.yml

@@ -8,117 +8,125 @@ workflows:
   main:
     jobs:
         ################################
-        #### PIP
+        ## LINTER: All
         ################################
         ################################
-        - Pip-PyPI
-        - Pip-Local
+        - Linux:
+            name: Linter | v3.10 | Linux
+            mode: LINTER
         ################################
-        #### UNIT TESTS
+        #### PIP: Master
+        ################################
+        ################################
+        - Pip-PyPI:
+            filters:
+              branches:
+                only: master
+        - Pip-Local:
+            filters:
+              branches:
+                only: master
+        ################################
+        #### UNIT TESTS: PR
         ################################
         ################################
         - Linux:
-            name: "Test | v3.8 | Linux"
-            v: "3.8"
-            mode: "TEST"
-            ray: "DISABLED"
-        - Linux:
-            name: "Test | v3.9 | Linux"
-            v: "3.9"
-            mode: "TEST"
-            ray: "DISABLED"
-        - Linux:
-            name: "Test | v3.10 | Linux"
-            v: "3.10"
-            mode: "TEST"
-            ray: "DISABLED"
-        - Linux:
-            name: "Test | v3.11 | Linux"
-            v: "3.11"
-            mode: "TEST"
-            ray: "DISABLED"
+            name: Unit Test | v3.10 | Linux
+            mode: UNIT
+            filters:
+              branches:
+                ignore: 
+                  - master
+                  - staging
+        ################################
+        #### SHORT INTEGRATION TESTS: PR
+        ################################
+        ################################
         - Linux:
-            name: "Test | Ray | v3.8 | Linux"
-            v: "3.8"
-            mode: "TEST"
-            ray: "ENABLED"
+            name: Short Integration Test | v3.10 | Linux
+            mode: SHORT INTEGRATION
+            filters:
+              branches:
+                ignore: 
+                  - master
+                  - staging
+        ################################
+        #### LONG INTEGRATION TESTS:
+        #### Staging
+        ################################
+        ################################
         - Linux:
-            name: "Test | Ray | v3.9 | Linux"
-            v: "3.9"
-            mode: "TEST"
-            ray: "ENABLED"
+            name: Long Integration Test | v<< matrix.v >> | Linux
+            mode: LONG INTEGRATION
+            matrix:
+              parameters:
+                v: ["3.8", "3.9", "3.10", "3.11"]
+            filters:
+              branches:
+                only: staging
+        ################################
+        #### LONG INTEGRATION TESTS + RAY:
+        #### Staging, Master
+        ################################
+        ################################
         - Linux:
-            name: "Test | Ray | v3.10 | Linux"
-            v: "3.10"
-            mode: "TEST"
-            ray: "ENABLED"
-        # Ray does not work on 3.11
-        # https://github.com/ray-project/ray/issues/33232
-        # - Linux:
-        #     name: "Test | v3.11 | Linux"
-        #     v: "3.11"
-        #     mode: "TEST"
-        #     ray: "ENABLED"
+            name: Long Integration Test | Ray | v<< matrix.v >> | Linux
+            mode: LONG INTEGRATION
+            ray: ENABLED
+            matrix:
+              parameters:
+                v: ["3.8", "3.9", "3.10"]
+            filters:
+              branches:
+                only: 
+                  - master
+                  - staging
         ################################
-        ### INTEGRATIONS
+        ### THIRD PARTY: Staging, Master
         ################################
         ################################
         - Postgres:
-            name: "Test Integration - Postgres | v3.10 | Linux"
-            v: "3.10"
-            mode: "INTEGRATION"
+            name: Third Party Test - Postgres | v3.10 | Linux
+            filters:
+              branches:
+                only: 
+                  - master
+                  - staging
         ################################
-        ### NOTEBOOKS
+        ### NOTEBOOKS: Staging, Master
         ################################
         ################################
         - Linux:
-            name: "Notebook | v3.8 | Linux"
-            v: "3.8"
-            mode: "NOTEBOOK"
-            ray: "DISABLED"
-        - Linux:
-            name: "Notebook | v3.9 | Linux"
-            v: "3.9"
-            mode: "NOTEBOOK"
-            ray: "DISABLED"
-        - Linux:
-            name: "Notebook | v3.10 | Linux"
-            v: "3.10"
-            mode: "NOTEBOOK"
-            ray: "DISABLED"
-        - Linux:
-            name: "Notebook | v3.11 | Linux"
-            v: "3.11"
-            mode: "NOTEBOOK"
-            ray: "DISABLED"            
-        - Linux:
-            name: "Notebook | Ray | v3.8 | Linux"
-            v: "3.8"
-            mode: "NOTEBOOK"
-            ray: "ENABLED"
-        - Linux:
-            name: "Notebook | Ray | v3.9 | Linux"
-            v: "3.9"
-            mode: "NOTEBOOK"
-            ray: "ENABLED"            
-        - Linux:
-            name: "Notebook |  Ray | v3.10 | Linux"
-            v: "3.10"
-            mode: "NOTEBOOK"
-            ray: "ENABLED"            
-        # - Linux:
-        #     name: "Notebook | v3.11 | Linux"
-        #     v: "3.11"
-        #     mode: "NOTEBOOK"
+            name: Notebook Test | v<< matrix.v >> | Linux
+            mode: NOTEBOOK
+            filters:
+              branches:
+                only: 
+                  - master
+                  - staging
+            matrix:
+              parameters:
+                v: ["3.8", "3.9", "3.10", "3.11"]
         ################################
-        ## LINTER
+        #### FULL TESTS:
+        #### Master 
         ################################
         ################################
         - Linux:
-            name: "Linter | Linux"
-            v: "3.10"
-            mode: "LINTER"
-            ray: "DISABLED"
+            name: Full Test | v<< matrix.v >> | Linux
+            mode: FULL
+            matrix:
+              parameters:
+                v: ["3.8", "3.9", "3.10", "3.11"]
+            filters:
+              branches:
+                only: master 
+        ################################
+        # DOCKER AND CLOUD: Master
+        ################################
+        ################################
+        # - Docker-Local
+        # - AWS
         ################################
         # OTHER OPERATING SYSTEMS
         ################################
@@ -127,12 +135,6 @@ workflows:
         #    name: "Windows | v3.10"
         # - MacOS:
         #    name: "MacOS | v3.10"
-        ################################
-        # DOCKER AND CLOUD
-        ################################
-        ################################
-        - Docker-Local
-        - AWS
 
 jobs:
   Linux:
@@ -142,7 +144,7 @@ jobs:
         default: "3.10"
       mode:
         type: string
-        default: "ALL"
+        default: "FULL"
       ray:
         type: string
         default: "DISABLED"
@@ -154,6 +156,12 @@ jobs:
 
       - checkout
 
+      # Restore pip wheel
+      - restore_cache:
+          keys:
+            - v1-pip-wheel_cache-python<< parameters.v >>-ray<< parameters.ray >>-{{ checksum "setup.py" }}
+
+      # Restore model
       - restore_cache:
           keys:
             - v1-model_cache-{{ checksum "setup.py" }}
@@ -184,7 +192,7 @@ jobs:
 
       - run:
           name: Test and upload coverage report to coveralls
-          no_output_timeout: 30m # 30 minute timeout
+          no_output_timeout: 10m # 10 minute timeout
           environment:
             PY_VERSION: << parameters.v >>
           command: |
@@ -198,7 +206,7 @@ jobs:
       # Enable cache save conditionally (to avoid empty cache in Notebooks)
       - when:
           condition: 
-            equal: [ TEST, << parameters.mode >> ]
+            equal: [ FULL, << parameters.mode >> ]
           steps:
             - save_cache:
                 key: v1-model_cache-{{ checksum "setup.py" }}
@@ -207,15 +215,16 @@ jobs:
                   - /home/circleci/.cache/torch/
                   - /home/circleci/.cache/gpt4all/
 
+      - save_cache:
+          key: v1-pip-wheel_cache-python<< parameters.v >>-ray<< parameters.ray >>-{{ checksum "setup.py" }}
+          paths:
+            - test_evadb
+
   Postgres:
     parameters:
       v:
         type: string
         default: "3.10"
-      mode:
-        type: string
-        default: "ALL"
-
     resource_class: large
     docker:
       # https://circleci.com/docs/circleci-images#language-image-variants  DATABASE_URL: postgresql://postgres:password@localhost:5432/evadb

evadb/version.py

@@ -3,4 +3,4 @@
 _REVISION = "3+dev"
 
 VERSION_SHORT = f"{_MAJOR}.{_MINOR}"
-VERSION = f"{_MAJOR}.{_MINOR}.{_REVISION}"
+VERSION = f"{_MAJOR}.{_MINOR}.{_REVISION}"