diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f60f876b41..7f7a06eb2db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,12 +33,12 @@ _commands: - restore_cache: name: Restore Cache << parameters.key >> keys: - - "<< parameters.key >>-v11\ + - "<< parameters.key >>-v12\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ -{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}" - - "<< parameters.key >>-v11\ + - "<< parameters.key >>-v12\ -{{ arch }}\ -main\ -\ @@ -58,7 +58,7 @@ _commands: steps: - save_cache: name: Save Cache << parameters.key >> - key: "<< parameters.key >>-v11\ + key: "<< parameters.key >>-v12\ -{{ arch }}\ -{{ .Branch }}\ -{{ .Environment.CIRCLE_PR_NUMBER }}\ @@ -442,7 +442,7 @@ _environments: UNDERLAY_MIXINS: "release ccache lld" CCACHE_LOGFILE: "/tmp/ccache.log" CCACHE_MAXSIZE: "200M" - MAKEFLAGS: "-j 2 -l 2 " + # MAKEFLAGS: "-j 4 -l 4 " COLCON_DEFAULTS_FILE: "/tmp/defaults.yaml" RCUTILS_LOGGING_BUFFERED_STREAM: "0" RCUTILS_LOGGING_USE_STDOUT: "0" @@ -450,6 +450,7 @@ _environments: executors: release_exec: + resource_class: large docker: - image: ghcr.io/ros-planning/navigation2:main working_directory: /opt/overlay_ws diff --git a/.circleci/defaults.yaml b/.circleci/defaults.yaml index e0d946f78ee..90a99d654f5 100644 --- a/.circleci/defaults.yaml +++ b/.circleci/defaults.yaml @@ -6,7 +6,7 @@ _common: &common "build": <<: *common "executor": "parallel" - "parallel-workers": 2 + # "parallel-workers": 4 "symlink-install": true "test": <<: *common