diff --git a/.circleci/config.yml b/.circleci/config.yml index b0c8aa69fc..cb22e9b131 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,8 +161,8 @@ commands: steps: - restore_cache: keys: - - 9-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} - - 9-yarn-{{ arch }}- + - 8-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} + - 8-yarn-{{ arch }}- name: Restore Yarn Package Cache - run: command: yarn install --immutable --immutable-cache @@ -172,7 +172,7 @@ commands: name: Yarn native working_directory: native - save_cache: - key: 9-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} + key: 8-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} name: Save Yarn Package Cache paths: - native/.yarn/cache @@ -476,13 +476,12 @@ jobs: - run: command: yarn workspace web stylelint name: Stylelint + - run: + command: yarn generate-licenses + name: Generate licenses native - run: command: yarn ts:check name: TS check - - run: - command: yarn tsc --build - name: TS check native - working_directory: native - unit_test deliver_android: docker: diff --git a/.circleci/src/commands/restore_yarn_cache.yml b/.circleci/src/commands/restore_yarn_cache.yml index cd580f5f11..1adf91110d 100644 --- a/.circleci/src/commands/restore_yarn_cache.yml +++ b/.circleci/src/commands/restore_yarn_cache.yml @@ -3,8 +3,8 @@ steps: - restore_cache: name: Restore Yarn Package Cache keys: - - 9-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} - - 9-yarn-{{ arch }}- + - 8-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} + - 8-yarn-{{ arch }}- - run: name: Yarn command: yarn install --immutable --immutable-cache @@ -14,7 +14,7 @@ steps: command: yarn install --immutable - save_cache: name: Save Yarn Package Cache - key: 9-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} + key: 8-yarn-{{ arch }}-{{ checksum "yarn.lock" }}-{{ checksum "native/yarn.lock"}}-{{ checksum "package.json" }}-{{ checksum "native/package.json" }}-{{ checksum "web/package.json" }} paths: - native/.yarn/cache - native/.yarn/install-state.gz diff --git a/.circleci/src/jobs/check.yml b/.circleci/src/jobs/check.yml index 2db8c0e924..c2dee0070a 100644 --- a/.circleci/src/jobs/check.yml +++ b/.circleci/src/jobs/check.yml @@ -21,11 +21,10 @@ steps: - run: name: Stylelint command: yarn workspace web stylelint + - run: + name: Generate licenses native + command: yarn generate-licenses - run: name: TS check command: yarn ts:check - - run: - name: TS check native - command: yarn tsc --build - working_directory: native - unit_test