diff --git a/.circleci/config.yml b/.circleci/config.yml index b0a3238fb6..237612150c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,9 +4,35 @@ orbs: python: circleci/python@1.5.0 jobs: - core-integration-tests: + style_and_unit_tests: + parameters: + python_version: + type: string + docker: + - image: cimg/python:<< parameters.python_version >> + resource_class: small + steps: + - checkout + - run: + name: Install OpenJDK + command: sudo apt-get update && sudo apt-get install default-jdk + - run: + name: Install dependencies + command: make install-dev + - run: + name: Run liners and code style checks + command: make style + - run: + name: Run unit tests + command: make unit-test + - run: + name: Run doc tests + command: make doc-test + + core_integration_tests: docker: - image: cimg/python:3.7 + resource_class: small steps: - checkout - run: @@ -16,10 +42,11 @@ jobs: name: Run Core integration tests command: make core-it-test - airflow-integration-tests: + airflow_integration_tests: machine: image: ubuntu-2204:2022.10.2 docker_layer_caching: true + resource_class: large steps: - checkout - run: @@ -39,7 +66,11 @@ jobs: path: /tmp/airflow_logs workflows: - main-pr-integration-tests: + main_pr: jobs: - - core-integration-tests - - airflow-integration-tests + - style_and_unit_tests: + matrix: + parameters: + python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + - core_integration_tests + - airflow_integration_tests diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index 6bd7c19f34..0000000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: SQLMesh Main - -on: - pull_request: - branches: [ main ] -jobs: - style-and-unit-tests: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - make install-dev - - name: Run linters and code style checks - run: | - make style - - name: Run unit tests - run: | - make unit-test - - name: Run doc tests - run: | - make doc-test