From b4626ec9e7d3fa9991412b5aed3bd3f0b5e67221 Mon Sep 17 00:00:00 2001 From: mwallert Date: Mon, 9 Nov 2020 13:53:58 -0800 Subject: [PATCH 1/5] fix(circleci): Updates xcode version --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17907a8..7b83382 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,9 @@ -version: 2 +version: 2.1 default_config: &default_config working_directory: ~/circleci/SP-NativeScript macos: - xcode: "9.3.0" + xcode: "11.3.0" environment: ANDROID_HOME: "/usr/local/share/android-sdk" From 6a2b76d05481b4f440a9e68f90fc3a054aca93dc Mon Sep 17 00:00:00 2001 From: mwallert Date: Mon, 9 Nov 2020 14:38:22 -0800 Subject: [PATCH 2/5] fix(circleci): Adds cache layer for homebrew --- .circleci/config.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b83382..5c364a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,14 +18,20 @@ jobs: command: | curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf # Fetch cocoapods specs from S3 instead of github + - restore_cache: + key: brew-cache-{{ checksum "/usr/local/Homebrew" }} - run: name: Setup system dependencies command: | brew update brew cask install android-sdk echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "platforms;android-25" "build-tools;25.0.2" "extras;android;m2repository" "extras;google;m2repository" + - save_cache: + key: brew-cache-{{ checksum "/usr/local/Homebrew" }} + paths: + - /usr/local/Homebrew - restore_cache: - key: npm-cache-{{ checksum "./package-lock.json" }} + key: npm-cache-{{ checksum "./package.json" }} - run: name: "Install node dependencies" command: | @@ -33,7 +39,7 @@ jobs: npx tns usage-reporting disable npx tns error-reporting disable - save_cache: - key: npm-cache-{{ checksum "./package-lock.json" }} + key: npm-cache-{{ checksum "./package.json" }} paths: - ~/.npm - run: From f8ff0f7dd89c25bc696d43d26e5499ed89c60860 Mon Sep 17 00:00:00 2001 From: mwallert Date: Wed, 13 Jan 2021 10:31:20 -0800 Subject: [PATCH 3/5] refactor(circleci): Comments out unused or unknown pieces of config --- .circleci/config.yml | 75 +++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c364a0..04206a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,23 +13,17 @@ jobs: steps: - checkout - add_ssh_keys - - run: - name: Fetch CocoaPods repository - command: | - curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf - # Fetch cocoapods specs from S3 instead of github - - restore_cache: - key: brew-cache-{{ checksum "/usr/local/Homebrew" }} + # - run: + # name: Fetch CocoaPods repository + # command: | + # curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf + # # Fetch cocoapods specs from S3 instead of github - run: name: Setup system dependencies command: | brew update brew cask install android-sdk echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "platforms;android-25" "build-tools;25.0.2" "extras;android;m2repository" "extras;google;m2repository" - - save_cache: - key: brew-cache-{{ checksum "/usr/local/Homebrew" }} - paths: - - /usr/local/Homebrew - restore_cache: key: npm-cache-{{ checksum "./package.json" }} - run: @@ -55,18 +49,19 @@ jobs: - run: name: "Prepare Android" command: npx tns prepare android - - run: - name: "Build iOS" - command: | - ./scripts/build_ios.sh org.nativescript.circleciint - - run: - name: "Build Android" - command: | - ./scripts/build_android.sh - - persist_to_workspace: - root: ~/circleci - paths: - - tns-circleci-example + # Need to find out where these scripts are + # - run: + # name: "Build iOS" + # command: | + # ./scripts/build_ios.sh org.nativescript.circleciint + # - run: + # name: "Build Android" + # command: | + # ./scripts/build_android.sh + # - persist_to_workspace: + # root: ~/circleci + # paths: + # - tns-circleci-example test-unit: <<: *default_config @@ -92,18 +87,18 @@ jobs: npx tns usage-reporting disable npx tns error-reporting disable echo "TODO" - - deploy: - <<: *default_config - steps: - - attach_workspace: - at: ~/circleci - - run: - name: "Deploy" - command: | - npx tns usage-reporting disable - npx tns error-reporting disable - ./scripts/deploy.sh + # This should be uncommented when used in a project + # deploy: + # <<: *default_config + # steps: + # - attach_workspace: + # at: ~/circleci + # - run: + # name: "Deploy" + # command: | + # npx tns usage-reporting disable + # npx tns error-reporting disable + # ./scripts/deploy.sh workflows: version: 2 @@ -116,9 +111,9 @@ workflows: - test-e2e: requires: - build - - deploy: - requires: - - build - - test-unit - - test-e2e + # - deploy: + # requires: + # - build + # - test-unit + # - test-e2e From d1221f6bf40a5a57d72f045a1d27dadc3987b6fc Mon Sep 17 00:00:00 2001 From: mwallert Date: Wed, 13 Jan 2021 10:42:00 -0800 Subject: [PATCH 4/5] fix(brew): Adds 'unshallow' version of homebrew --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04206a8..b18f76f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,8 @@ jobs: - run: name: Setup system dependencies command: | + git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow + git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask fetch --unshallow brew update brew cask install android-sdk echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "platforms;android-25" "build-tools;25.0.2" "extras;android;m2repository" "extras;google;m2repository" From 42443f034e7cc52b2830375de3548cb7187a1758 Mon Sep 17 00:00:00 2001 From: mwallert Date: Wed, 13 Jan 2021 10:57:33 -0800 Subject: [PATCH 5/5] fix(brew): Adds --cask to install --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b18f76f..cc548ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core fetch --unshallow git -C /usr/local/Homebrew/Library/Taps/homebrew/homebrew-cask fetch --unshallow brew update - brew cask install android-sdk + brew install android-sdk --cask echo y | $ANDROID_HOME/tools/bin/sdkmanager "platform-tools" "platforms;android-25" "build-tools;25.0.2" "extras;android;m2repository" "extras;google;m2repository" - restore_cache: key: npm-cache-{{ checksum "./package.json" }}