diff --git a/.circleci/config.yml b/.circleci/config.yml index 58191364b3447a..10deb3e54c19ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,6 @@ version: 2.1 orbs: win: circleci/windows@2.4.0 -# ------------------------- -# Single Use Environmental Variables -# ------------------------- -envs: - shallow_checkout_depth: &shallow_checkout_depth 1 - # ------------------------- # REFERENCES # ------------------------- @@ -40,7 +34,7 @@ references: # Dependency Anchors # ------------------------- dependency_versions: - xcode_version: &xcode_version "13.4.1" + xcode_version: &xcode_version "13.3.1" nodelts_image: &nodelts_image "cimg/node:16.14" nodeprevlts_image: &nodeprevlts_image "cimg/node:14.19" @@ -116,61 +110,19 @@ executors: # COMMANDS # ------------------------- commands: - shallow_checkout: - parameters: - checkout_depth: - default: *shallow_checkout_depth - type: integer - steps: - - run: - name: Add sshkey for Github - command: | - mkdir -p ~/.ssh - ssh-keyscan -H github.com >> ~/.ssh/known_hosts - - run: - name: Shallow clone repo - command: | - git clone --branch main --no-checkout "$CIRCLE_REPOSITORY_URL" --single-branch . - # Fetch from fork if applicable - if [ -n "$CIRCLE_PR_NUMBER" ] ; then - git fetch --force --depth 1 origin +refs/pull/$CIRCLE_PR_NUMBER/head:refs/remotes/origin/pull/$CIRCLE_PR_NUMBER - fi - if [ -n "$CIRCLE_BRANCH" ] ; then - git checkout --force -B "$CIRCLE_BRANCH" "$CIRCLE_SHA1" - else - git checkout main - fi - # Checkout with cache, on machines that are using Docker the cache is ignored checkout_code_with_cache: parameters: checkout_base_cache_key: default: *checkout_cache_key type: string - shallow_checkout: - default: true - type: boolean - shallow_checkout_depth: - default: *shallow_checkout_depth - type: integer steps: - restore_cache: keys: - << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }} - << parameters.checkout_base_cache_key >>-{{ .Branch }}- - << parameters.checkout_base_cache_key >> - - - when: - condition: << parameters.shallow_checkout >> - steps: - - shallow_checkout: - checkout_depth: << parameters.shallow_checkout_depth >> - - when: - condition: - not: << parameters.shallow_checkout >> - steps: - - checkout - + - checkout - save_cache: key: << parameters.checkout_base_cache_key >>-{{ .Branch }}-{{ .Revision }} paths: @@ -306,7 +258,7 @@ commands: type: steps set_tarball_path: type: boolean - default: false + default: False steps: - restore_cache: keys: @@ -349,7 +301,7 @@ jobs: analyze_pr: executor: reactnativeandroid steps: - - shallow_checkout + - checkout - run_yarn - install_github_bot_deps @@ -377,7 +329,7 @@ jobs: analyze_code: executor: reactnativeandroid steps: - - shallow_checkout + - checkout - setup_artifacts - run_yarn @@ -429,7 +381,7 @@ jobs: default: false executor: << parameters.executor >> steps: - - shallow_checkout + - checkout - setup_artifacts - run_yarn - run: @@ -527,7 +479,7 @@ jobs: command: bundle exec pod setup - with_hermes_tarball_cache_span: - set_tarball_path: true + set_tarball_path: True steps: - with_rntester_pods_cache_span: steps: @@ -646,7 +598,7 @@ jobs: type: boolean default: false steps: - - shallow_checkout + - checkout - setup_artifacts - run_yarn @@ -790,7 +742,7 @@ jobs: package: cmake - with_hermes_tarball_cache_span: - set_tarball_path: true + set_tarball_path: True steps: - run: name: Install CocoaPods dependencies @@ -823,8 +775,7 @@ jobs: - ANDROID_TOOLS_VERSION: 31.0.0 - GRADLE_OPTS: -Dorg.gradle.daemon=false steps: - - checkout_code_with_cache: - shallow_checkout: false + - checkout_code_with_cache - run: name: Install Node @@ -902,7 +853,7 @@ jobs: - CI_BUILD_NUMBER: $CIRCLE_BUILD_NUM - CI_BUILD_URL: $CIRCLE_BUILD_URL steps: - - shallow_checkout + - checkout - setup_artifacts - run_yarn - run: @@ -933,7 +884,7 @@ jobs: curl -sL https://deb.nodesource.com/setup_16.x | bash - apt install -y nodejs npm install --global yarn - - shallow_checkout + - checkout - run_yarn - run: name: Set up Hermes workspace and caching @@ -1190,7 +1141,7 @@ jobs: command: | mkdir -p ~/.ssh echo '|1|If6MU203eXTaaWL678YEfWkVMrw=|kqLeIAyTy8pzpj8x8Ae4Fr8Mtlc= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts - - shallow_checkout + - checkout - *attach_hermes_workspace - run: name: Copy HermesC binaries