From 34682377b99df5bb5caaec6bad1a9c1cd3ee7a4d Mon Sep 17 00:00:00 2001
From: Tao Xu <taox@fb.com>
Date: Fri, 1 Oct 2021 09:33:12 -0700
Subject: [PATCH] [iOS][CI] Update dev certs (#66004)

Summary:
Fixes https://github.com/pytorch/pytorch/issues/65988

Pull Request resolved: https://github.com/pytorch/pytorch/pull/66004

Reviewed By: xta0

Differential Revision: D31340893

Pulled By: malfet

fbshipit-source-id: 3bf0be266e9686a73d62e86c5cf0bebeb0416260
---
 .circleci/config.yml                             |  11 ++++++-----
 .circleci/scripts/binary_ios_test.sh             |  11 ++++++-----
 .../job-specs/job-specs-custom.yml               |  11 ++++++-----
 ios/TestApp/AppleWWDRCAG3.cer                    | Bin 0 -> 1109 bytes
 ios/TestApp/fastlane/Fastfile                    |   9 ++++++++-
 5 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 ios/TestApp/AppleWWDRCAG3.cer

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8375454e8b6..38147924316 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1566,16 +1566,17 @@ jobs:
             # install fastlane
             sudo gem install bundler && bundle install
             # install certificates
-            echo ${IOS_CERT_KEY} >> cert.txt
+            echo ${IOS_CERT_KEY_2022} >> cert.txt
             base64 --decode cert.txt -o Certificates.p12
             rm cert.txt
-            bundle exec fastlane install_cert
+            bundle exec fastlane install_root_cert
+            bundle exec fastlane install_dev_cert
             # install the provisioning profile
-            PROFILE=PyTorch_CI_2021.mobileprovision
+            PROFILE=PyTorch_CI_2022.mobileprovision
             PROVISIONING_PROFILES=~/Library/MobileDevice/Provisioning\ Profiles
             mkdir -pv "${PROVISIONING_PROFILES}"
             cd "${PROVISIONING_PROFILES}"
-            echo ${IOS_SIGN_KEY} >> cert.txt
+            echo ${IOS_SIGN_KEY_2022} >> cert.txt
             base64 --decode cert.txt -o ${PROFILE}
             rm cert.txt
       - run:
@@ -1636,7 +1637,7 @@ jobs:
           command: |
             set -e
             PROJ_ROOT=/Users/distiller/project
-            PROFILE=PyTorch_CI_2021
+            PROFILE=PyTorch_CI_2022
             # run the ruby build script
             if ! [ -x "$(command -v xcodebuild)" ]; then
               echo 'Error: xcodebuild is not installed.'
diff --git a/.circleci/scripts/binary_ios_test.sh b/.circleci/scripts/binary_ios_test.sh
index b9028b4a001..3f052175235 100644
--- a/.circleci/scripts/binary_ios_test.sh
+++ b/.circleci/scripts/binary_ios_test.sh
@@ -8,16 +8,17 @@ cd ${PROJ_ROOT}/ios/TestApp
 # install fastlane
 sudo gem install bundler && bundle install
 # install certificates
-echo "${IOS_CERT_KEY}" >> cert.txt
+echo "${IOS_CERT_KEY_2022}" >> cert.txt
 base64 --decode cert.txt -o Certificates.p12
 rm cert.txt
-bundle exec fastlane install_cert
+bundle exec fastlane install_root_cert
+bundle exec fastlane install_dev_cert
 # install the provisioning profile
-PROFILE=PyTorch_CI_2021.mobileprovision
+PROFILE=PyTorch_CI_2022.mobileprovision
 PROVISIONING_PROFILES=~/Library/MobileDevice/Provisioning\ Profiles
 mkdir -pv "${PROVISIONING_PROFILES}"
 cd "${PROVISIONING_PROFILES}"
-echo "${IOS_SIGN_KEY}" >> cert.txt
+echo "${IOS_SIGN_KEY_2022}" >> cert.txt
 base64 --decode cert.txt -o ${PROFILE}
 rm cert.txt
 # run the ruby build script
@@ -25,5 +26,5 @@ if ! [ -x "$(command -v xcodebuild)" ]; then
     echo 'Error: xcodebuild is not installed.'
     exit 1
 fi
-PROFILE=PyTorch_CI_2021
+PROFILE=PyTorch_CI_2022
 ruby ${PROJ_ROOT}/scripts/xcode_build.rb -i ${PROJ_ROOT}/build_ios/install -x ${PROJ_ROOT}/ios/TestApp/TestApp.xcodeproj -p ${IOS_PLATFORM} -c ${PROFILE} -t ${IOS_DEV_TEAM_ID}
diff --git a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml
index 98c3d73314b..dafc543a123 100644
--- a/.circleci/verbatim-sources/job-specs/job-specs-custom.yml
+++ b/.circleci/verbatim-sources/job-specs/job-specs-custom.yml
@@ -467,16 +467,17 @@
             # install fastlane
             sudo gem install bundler && bundle install
             # install certificates
-            echo ${IOS_CERT_KEY} >> cert.txt
+            echo ${IOS_CERT_KEY_2022} >> cert.txt
             base64 --decode cert.txt -o Certificates.p12
             rm cert.txt
-            bundle exec fastlane install_cert
+            bundle exec fastlane install_root_cert
+            bundle exec fastlane install_dev_cert
             # install the provisioning profile
-            PROFILE=PyTorch_CI_2021.mobileprovision
+            PROFILE=PyTorch_CI_2022.mobileprovision
             PROVISIONING_PROFILES=~/Library/MobileDevice/Provisioning\ Profiles
             mkdir -pv "${PROVISIONING_PROFILES}"
             cd "${PROVISIONING_PROFILES}"
-            echo ${IOS_SIGN_KEY} >> cert.txt
+            echo ${IOS_SIGN_KEY_2022} >> cert.txt
             base64 --decode cert.txt -o ${PROFILE}
             rm cert.txt
       - run:
@@ -537,7 +538,7 @@
           command: |
             set -e
             PROJ_ROOT=/Users/distiller/project
-            PROFILE=PyTorch_CI_2021
+            PROFILE=PyTorch_CI_2022
             # run the ruby build script
             if ! [ -x "$(command -v xcodebuild)" ]; then
               echo 'Error: xcodebuild is not installed.'
diff --git a/ios/TestApp/AppleWWDRCAG3.cer b/ios/TestApp/AppleWWDRCAG3.cer
new file mode 100644
index 0000000000000000000000000000000000000000..32f96f81dd6ea4c1c0f8e84698a50df773444b83
GIT binary patch
literal 1109
zcmXqLVhJ>8Vzyks%*4pVBv7+HlS_5G<-h9LE>#CBj=nSCW#iOp^Jx3d%gD&h%3zRW
z$Zf#M#vIDRCd?EXY$$9X2;y)Fb2%0i<fJNi<|XSHsu`$&1i6J}A%f1SMJ1VOnaPPI
znfZANj-@3T`9+x}m4;#lA|Q3l!n_c5LHYS53eJuOa^k#31_nlkmWCFF#wO-b;=IN{
zE>H*zq6|t6T@0MSI(e)iI>Ymea#G4OQ&JUNQp-|v@(WUn6oOK7z!nxO;Ibd;6K)<R
zcVoCuc#wU9>{o*(MkVCXU}R-rZerwT0E%-lH8C<W-1yr0XGJ7;`*EL%db(i~E?3Ad
zF?hMu<2|?Ye%+SeDzUE8PhUrx3B`n@%*#pA-EwUDsWUd;uCY!0^OR|sOxBjltLdlL
zytHQ*eAu$bT{f-Ha?y(|o^P!#Jrqc&>YLni>cB0Y1I-s6|D1SjdC!T1#gEpxT}+xg
zX~l#D^V*DQXL}#~nf<F`_v7mIy5e`E|20G^mx}KYI`~%lsmZy2N?Yf7Zg?8HzrSUX
z&5B(|+op;=VK_OT`NEmaR$|rHSYzhCc3;Q4Rkw#P)7RmGw~sZ;yk5nPYxJB$49*?w
zYMU~{`+gR${lDKb>!ynzs^Bts5HBBM?YUi*LCU=8QrPsRL7p`U7PH?oF*7nSE^d5p
z(D=qc2pB!G!i<dnSvU;XfD{uWgMmCqOqoT(K&(MT`$DGslrqkLU$T4k9F~1|_pRrM
zGjL(!&}L&~Wo2h%WU(+XGcbYi4H(-rGD=Dctn~HslZy-V5<zKAFF8LK%r!991q&1b
zlTUJ@fgZ>jc@}j8RRiS(iVNi1WT9G<i*k^3f>i4Pg$!gt>iJm2SVTDg9T1)HbA1Ze
zB%z&Z8p%A<-z?u`zz34%2l<2rm_yhM1lYL1`5`%ljfs(k3792Na|kd^Ffy!76@KyU
zL1VcKle^Qt_@$N#uaZ{&Jv!lJvGCP-voEaT@9jPPmhpU!hC}r6P!-1?f6gD=s{HcK
zn~(XY8f4249ZB?5O<&J{%2IXh<;PWLj5T=q^cIFY6#se_vyLrL^X=nS9{<EUMq=IN
z7hF!o7BL&T%~?0wLF(6+2bb-B>G!0~pME4H^8F=`FYGft6Cx##-<@*tz`>mQ3dQ$4
zudQ=tHhBjnSZuXy%6$`L7`%^vqK~I%N&m9I(=G0PvZd;Idw*Vv`CNY}hnv&vQOc7;
z=FB3JS6^jKS+(-^zi+cR(!1Yl?^q@7*}VSz={+ycznWUOVT<dcGf&%BaUFKFs*Jf6
JU@~{AH2}Gqoj3ph

literal 0
HcmV?d00001

diff --git a/ios/TestApp/fastlane/Fastfile b/ios/TestApp/fastlane/Fastfile
index 3e8ef00f0f7..42a6346e1b7 100644
--- a/ios/TestApp/fastlane/Fastfile
+++ b/ios/TestApp/fastlane/Fastfile
@@ -4,7 +4,14 @@ platform :ios do
   before_all do
     setup_circle_ci
   end
-  lane :install_cert do
+  lane :install_root_cert do
+    import_certificate(
+      certificate_path: "AppleWWDRCAG3.cer",
+      keychain_path: "/Users/distiller/Library/Keychains/fastlane_tmp_keychain-db",
+      keychain_password: ""
+    )
+  end
+  lane :install_dev_cert do
     puts "Installing Certificates.p12"
     import_certificate(
       keychain_name: ENV["MATCH_KEYCHAIN_NAME"],