diff --git a/.circleci/config.yml b/.circleci/config.yml index 347539fb..38b2508d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ executors: parameters: xcode_version: type: string - default: '12.4.0' + default: '13.3.0' macos: xcode: <> environment: @@ -50,72 +50,75 @@ commands: - <>/Pods key: cache-pods-{{ checksum "<>/Podfile.lock" }}-v1 - setup_macos_executor: + install_node: parameters: - node_version: - type: string - default: '14.15.0' + node_version: + type: string + default: '14.15.0' + steps: + - run: + name: Install node@<> + command: | + set +e + command -v nvm + nvm install <> + nvm alias default <> + nvm use default + node -v + + install_yarn: + steps: + - run: + name: Install yarn + command: | + set +e + npm install --global yarn + source ~/.bashrc + yarn -v + + setup_macos_executor: steps: - attach_workspace: at: . - run: name: Configure Environment Variables command: | - echo 'export PATH="$PATH:/usr/local/opt/node@<>/bin:~/.yarn/bin:~/project/node_modules/.bin:~/project/example/node_modules/.bin"' >> $BASH_ENV - echo 'export ANDROID_HOME="/usr/local/share/android-commandlinetools"' >> $BASH_ENV - echo 'export ANDROID_SDK_ROOT="/usr/local/share/android-commandlinetools"' >> $BASH_ENV - echo 'export PATH="$ANDROID_SDK_ROOT/emulator:$ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:$PATH"' >> $BASH_ENV - echo 'export QEMU_AUDIO_DRV=none' >> $BASH_ENV - echo 'export JAVA_HOME=$(/usr/libexec/java_home)' >> $BASH_ENV + echo 'export PATH="$PATH:~/project/node_modules/.bin:~/project/example/node_modules/.bin"' >> $BASH_ENV source $BASH_ENV + - install_node + - install_yarn - restore_cache: key: | - brew-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 + brew-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 - restore_cache: key: | - brew-taps-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 + brew-taps-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 - restore_cache: key: | - brew-vendor-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 - - run: - name: Install node@<> - command: | - set +e - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash - echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV - echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV - source ~/.bashrc - command -v nvm - nvm install <> - nvm alias default <> + brew-vendor-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 - run: name: Configure Detox Environment command: | brew update >/dev/null brew bundle install >/dev/null touch .watchmanconfig - node -v - save_cache: paths: - ~/Library/Caches/Homebrew key: | - brew-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 + brew-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 - save_cache: paths: - /usr/local/Homebrew/Library/Taps key: | - brew-taps-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 + brew-taps-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 - save_cache: paths: - /usr/local/Homebrew/Library/Homebrew/vendor/ key: | - brew-vendor-cache-{{ arch }}-{{checksum "Brewfile"}}-v1 + brew-vendor-cache-{{ arch }}-{{checksum "Brewfile"}}-v2 setup_android_executor: - parameters: - node_version: - type: string - default: '14.15.0' steps: - attach_workspace: at: . @@ -124,22 +127,8 @@ commands: command: | echo 'export PATH="$PATH:~/project/node_modules/.bin:~/project/example/node_modules/.bin"' >> $BASH_ENV source $BASH_ENV - - run: - name: Install node@<> - command: | - set +e - command -v nvm - nvm install <> - nvm alias default <> - nvm use default - node -v - - run: - name: Install yarn - command: | - set +e - npm install --global yarn - source ~/.bashrc - yarn -v + - install_node + - install_yarn - run: name: Configure Detox Environment command: | @@ -228,9 +217,9 @@ jobs: executor: macos_custom steps: - macos/preboot-simulator: - version: "13.7" + version: "15.4" platform: iOS - device: iPhone 11 + device: iPhone 13 - setup_macos_executor - run: command: yarn install --frozen-lockfile diff --git a/.detoxrc.json b/.detoxrc.json index 87432595..5eac03cb 100644 --- a/.detoxrc.json +++ b/.detoxrc.json @@ -27,8 +27,8 @@ "simulator": { "type": "ios.simulator", "device": { - "type": "iPhone 11", - "os": "iOS 13.7" + "type": "iPhone 13", + "os": "iOS 15.4" } }, "emulator": {