diff --git a/.circleci/config.yml b/.circleci/config.yml index 1c386644a..5747eed39 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,6 +64,13 @@ jobs: keys: - v1-dependencies-{{ checksum "frontend/deps.edn"}} + - run: + name: "prepopulate linter cache" + working_directory: "./common" + command: | + yarn install + yarn run lint:clj + - run: name: "fmt check & linter" working_directory: "./frontend" @@ -81,6 +88,31 @@ jobs: yarn install yarn test + - save_cache: + paths: + - ~/.m2 + key: v1-dependencies-{{ checksum "frontend/deps.edn"}} + + + test-integration: + docker: + - image: penpotapp/devenv:latest + + working_directory: ~/repo + resource_class: medium+ + + environment: + JAVA_OPTS: -Xmx4g -Xms100m -XX:+UseSerialGC + NODE_OPTIONS: --max-old-space-size=4096 + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "frontend/deps.edn"}} + - run: name: "integration tests" working_directory: "./frontend" @@ -91,11 +123,6 @@ jobs: yarn run playwright install --with-deps chromium yarn run test:e2e - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "frontend/deps.edn"}} - test-backend: docker: - image: penpotapp/devenv:latest @@ -120,6 +147,13 @@ jobs: keys: - v1-dependencies-{{ checksum "backend/deps.edn" }} + - run: + name: "prepopulate linter cache" + working_directory: "./common" + command: | + yarn install + yarn run lint:clj + - run: name: "fmt check & linter" working_directory: "./backend" @@ -160,9 +194,12 @@ jobs: steps: - checkout - - run: cd .clj-kondo && cat config.edn - - run: cat .cljfmt.edn - - run: clj-kondo --version + - run: + name: "prepopulate linter cache" + working_directory: "./common" + command: | + yarn install + yarn run lint:clj - run: name: "fmt check & linter" @@ -176,6 +213,7 @@ workflows: penpot: jobs: - test-frontend + - test-integration - test-backend - test-common - test-exporter diff --git a/common/package.json b/common/package.json index 8115f9c03..425ff1a87 100644 --- a/common/package.json +++ b/common/package.json @@ -22,7 +22,7 @@ "scripts": { "fmt:clj:check": "cljfmt check --parallel=false src/ test/", "fmt:clj": "cljfmt fix --parallel=true src/ test/", - "lint:clj": "clj-kondo --parallel --lint src/", + "lint:clj": "clj-kondo --parallel=true --lint src/", "test:watch": "clojure -M:dev:shadow-cljs watch test", "test:compile": "clojure -M:dev:shadow-cljs compile test --config-merge '{:autorun false}'", "test:run": "node target/test.js",