From 9ee642562662037a24996b00babf9c0d43652cc8 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 10:22:05 +0530 Subject: [PATCH 1/6] Use phonegap-plugin-push 2.3.0 --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 84ebbd45a..4e5a06a6e 100755 --- a/Rakefile +++ b/Rakefile @@ -103,7 +103,7 @@ namespace :cordova do if platform == 'android' sh %{ cordova plugin add phonegap-plugin-push@2.1.2 } else - sh %{ cordova plugin add phonegap-plugin-push@1.9.2 --variable SENDER_ID="XXXXXXX" } + sh %{ cordova plugin add phonegap-plugin-push@2.3.0 --variable SENDER_ID="XXXXXXX" } end build = (environment == "staging" && platform == 'android') ? "debug" : "release" extra_params = (platform === "android") ? '' : ios_build_config From 418156efbf31dce051945d1a3b021f1cb1e65208 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 11:02:35 +0530 Subject: [PATCH 2/6] Circle-Ci changes for testing purpose --- .circleci/config.yml | 53 ++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 202708315..e66e69562 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,43 +76,6 @@ jobs: - run: yarn run bower install - save-cache: *save-bower-cache - tests: - <<: *defaults - docker: - - image: circleci/node:10-browsers - steps: - - restore-cache: *restore-repo-cache - - restore-cache: *restore-yarn-cache - - restore-cache: *restore-bower-cache - - run: - name: Start Ember test server - command: yarn run ember server --port 4201 - background: true - - run: - name: Wait for Ember test server to start - command: dockerize -wait tcp://localhost:4201 -timeout 1m - - run: - name: Run Ember tests - command: yarn test:ci - # command: COVERAGE=true yarn test:ci - # - persist_to_workspace: - # root: . - # paths: - # - coverage*/lcov.info - - upload-coverage: - <<: *defaults - steps: - - restore-cache: *restore-repo-cache - - restore-cache: *restore-yarn-cache - - restore-cache: *restore-bower-cache - - attach_workspace: - at: ~/code - - run: - name: Upload coverage results to Code Climate - command: | - yarn run codeclimate-test-reporter < coverage*/lcov.info - www_build: <<: *defaults steps: @@ -126,6 +89,9 @@ jobs: master) ENVIRONMENT=staging ;; + GCW-3202-ios-push-notifications) + ENVIRONMENT=staging + ;; preview) ENVIRONMENT=preview ;; @@ -215,6 +181,9 @@ jobs: master) ENVIRONMENT=staging ;; + GCW-3202-ios-push-notifications) + ENVIRONMENT=staging + ;; preview) ENVIRONMENT=preview ;; @@ -330,6 +299,12 @@ jobs: echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV echo 'export PROVISIONING_PROFILE=GoodcityAdminStaging.mobileprovision' >> $BASH_ENV ;; + GCW-3202-ios-push-notifications) + echo 'export ENVIRONMENT=staging' >> $BASH_ENV + echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV + echo 'export PROVISIONING_PROFILE=GoodCityStockStaging.mobileprovision' >> $BASH_ENV + echo 'export SCANDIT_LICENSE_KEY=$SCANDIT_LICENSE_KEY_IOS_STAGING' >> $BASH_ENV + ;; live) echo 'export ENVIRONMENT=production' >> $BASH_ENV echo 'export CERTIFICATE=Goodcity_2020.p12' >> $BASH_ENV @@ -437,7 +412,7 @@ workflows: - package_dependencies filters: branches: - only: /^(master|live)$/ + only: /^(master|live|GCW-3202-ios-push-notifications)$/ - android_build_and_deploy: requires: - ember_cordova_build @@ -449,4 +424,4 @@ workflows: - tests filters: branches: - only: /^(master|live)$/ + only: /^(master|live|GCW-3202-ios-push-notifications)$/ From 1ed8ca830b81e1f5c2bdd2fa5518ff34ef9a9644 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 11:10:39 +0530 Subject: [PATCH 3/6] Circle-Ci changes for testing purpose --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e66e69562..4ad261da8 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -395,7 +395,6 @@ workflows: # only: /^(master|live)$/ - www_build: requires: - - tests - package_dependencies filters: branches: @@ -408,7 +407,6 @@ workflows: only: /^(master|live|preview)$/ - ember_cordova_build: requires: - - tests - package_dependencies filters: branches: @@ -421,7 +419,6 @@ workflows: only: /^(master|live)$/ - ios_build_and_deploy: requires: - - tests filters: branches: only: /^(master|live|GCW-3202-ios-push-notifications)$/ From add13a596340cd4da179d0b4a1e4ae9ecc8e81ff Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 11:52:27 +0530 Subject: [PATCH 4/6] updating fastlane --- Gemfile.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbc259680..bcb2eefb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,7 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.1.0) - aws-partitions (1.426.0) + aws-partitions (1.430.0) aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -26,7 +26,7 @@ GEM aws-sdk-kms (1.42.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.88.0) + aws-sdk-s3 (1.89.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -86,7 +86,7 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) - emoji_regex (3.2.1) + emoji_regex (3.2.2) escape (0.0.4) excon (0.79.0) faraday (1.3.0) @@ -99,8 +99,8 @@ GEM faraday-net_http (1.0.1) faraday_middleware (1.0.0) faraday (~> 1.0) - fastimage (2.2.2) - fastlane (2.174.0) + fastimage (2.2.3) + fastlane (2.176.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) artifactory (~> 3.0) @@ -124,6 +124,7 @@ GEM jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) + naturally (~> 2.2) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) From 2616b029849c844857f0c375c78651cfb38e2ef2 Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 12:10:33 +0530 Subject: [PATCH 5/6] Circle-Ci changes for testing purpose --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ad261da8..cde3c7ff3 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -302,8 +302,7 @@ jobs: GCW-3202-ios-push-notifications) echo 'export ENVIRONMENT=staging' >> $BASH_ENV echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV - echo 'export PROVISIONING_PROFILE=GoodCityStockStaging.mobileprovision' >> $BASH_ENV - echo 'export SCANDIT_LICENSE_KEY=$SCANDIT_LICENSE_KEY_IOS_STAGING' >> $BASH_ENV + echo 'export PROVISIONING_PROFILE=GoodcityAdminStaging.mobileprovision' >> $BASH_ENV ;; live) echo 'export ENVIRONMENT=production' >> $BASH_ENV From fe248841d89f123e4ddcc29c5d037321ceeb7a8f Mon Sep 17 00:00:00 2001 From: bharat619 Date: Tue, 2 Mar 2021 13:04:46 +0530 Subject: [PATCH 6/6] Revert circleci changes --- .circleci/config.yml | 55 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cde3c7ff3..202708315 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,6 +76,43 @@ jobs: - run: yarn run bower install - save-cache: *save-bower-cache + tests: + <<: *defaults + docker: + - image: circleci/node:10-browsers + steps: + - restore-cache: *restore-repo-cache + - restore-cache: *restore-yarn-cache + - restore-cache: *restore-bower-cache + - run: + name: Start Ember test server + command: yarn run ember server --port 4201 + background: true + - run: + name: Wait for Ember test server to start + command: dockerize -wait tcp://localhost:4201 -timeout 1m + - run: + name: Run Ember tests + command: yarn test:ci + # command: COVERAGE=true yarn test:ci + # - persist_to_workspace: + # root: . + # paths: + # - coverage*/lcov.info + + upload-coverage: + <<: *defaults + steps: + - restore-cache: *restore-repo-cache + - restore-cache: *restore-yarn-cache + - restore-cache: *restore-bower-cache + - attach_workspace: + at: ~/code + - run: + name: Upload coverage results to Code Climate + command: | + yarn run codeclimate-test-reporter < coverage*/lcov.info + www_build: <<: *defaults steps: @@ -89,9 +126,6 @@ jobs: master) ENVIRONMENT=staging ;; - GCW-3202-ios-push-notifications) - ENVIRONMENT=staging - ;; preview) ENVIRONMENT=preview ;; @@ -181,9 +215,6 @@ jobs: master) ENVIRONMENT=staging ;; - GCW-3202-ios-push-notifications) - ENVIRONMENT=staging - ;; preview) ENVIRONMENT=preview ;; @@ -299,11 +330,6 @@ jobs: echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV echo 'export PROVISIONING_PROFILE=GoodcityAdminStaging.mobileprovision' >> $BASH_ENV ;; - GCW-3202-ios-push-notifications) - echo 'export ENVIRONMENT=staging' >> $BASH_ENV - echo 'export CERTIFICATE=GoodCity_2020_Development.p12' >> $BASH_ENV - echo 'export PROVISIONING_PROFILE=GoodcityAdminStaging.mobileprovision' >> $BASH_ENV - ;; live) echo 'export ENVIRONMENT=production' >> $BASH_ENV echo 'export CERTIFICATE=Goodcity_2020.p12' >> $BASH_ENV @@ -394,6 +420,7 @@ workflows: # only: /^(master|live)$/ - www_build: requires: + - tests - package_dependencies filters: branches: @@ -406,10 +433,11 @@ workflows: only: /^(master|live|preview)$/ - ember_cordova_build: requires: + - tests - package_dependencies filters: branches: - only: /^(master|live|GCW-3202-ios-push-notifications)$/ + only: /^(master|live)$/ - android_build_and_deploy: requires: - ember_cordova_build @@ -418,6 +446,7 @@ workflows: only: /^(master|live)$/ - ios_build_and_deploy: requires: + - tests filters: branches: - only: /^(master|live|GCW-3202-ios-push-notifications)$/ + only: /^(master|live)$/