diff --git a/.github/secrets/GoogleService-Info.plist.gpg b/.github/secrets/GoogleService-Info.plist.gpg deleted file mode 100644 index 6f04d0929..000000000 Binary files a/.github/secrets/GoogleService-Info.plist.gpg and /dev/null differ diff --git a/.github/secrets/app_fdroid-keystore.jks.gpg b/.github/secrets/app_fdroid-keystore.jks.gpg deleted file mode 100644 index 3c1db4912..000000000 Binary files a/.github/secrets/app_fdroid-keystore.jks.gpg and /dev/null differ diff --git a/.github/secrets/app_play-keystore.jks.gpg b/.github/secrets/app_play-keystore.jks.gpg deleted file mode 100644 index 32d9aa720..000000000 Binary files a/.github/secrets/app_play-keystore.jks.gpg and /dev/null differ diff --git a/.github/secrets/app_upload-keystore.jks.gpg b/.github/secrets/app_upload-keystore.jks.gpg deleted file mode 100644 index b723c00a0..000000000 Binary files a/.github/secrets/app_upload-keystore.jks.gpg and /dev/null differ diff --git a/.github/secrets/bitwarden-mobile-key.p12.gpg b/.github/secrets/bitwarden-mobile-key.p12.gpg deleted file mode 100644 index 85949be8c..000000000 Binary files a/.github/secrets/bitwarden-mobile-key.p12.gpg and /dev/null differ diff --git a/.github/secrets/dist_autofill.mobileprovision.gpg b/.github/secrets/dist_autofill.mobileprovision.gpg deleted file mode 100644 index de955c7b3..000000000 Binary files a/.github/secrets/dist_autofill.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_autofill.mobileprovision.gpg b/.github/secrets/dist_beta_autofill.mobileprovision.gpg deleted file mode 100644 index 7c5909684..000000000 Binary files a/.github/secrets/dist_beta_autofill.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_bitwarden.mobileprovision.gpg b/.github/secrets/dist_beta_bitwarden.mobileprovision.gpg deleted file mode 100644 index 6fa47dcf1..000000000 Binary files a/.github/secrets/dist_beta_bitwarden.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_extension.mobileprovision.gpg b/.github/secrets/dist_beta_extension.mobileprovision.gpg deleted file mode 100644 index d4cf54c82..000000000 Binary files a/.github/secrets/dist_beta_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_share_extension.mobileprovision.gpg b/.github/secrets/dist_beta_share_extension.mobileprovision.gpg deleted file mode 100644 index 5a77dfc1c..000000000 Binary files a/.github/secrets/dist_beta_share_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_watch_app.mobileprovision.gpg b/.github/secrets/dist_beta_watch_app.mobileprovision.gpg deleted file mode 100644 index 9e409a7dc..000000000 Binary files a/.github/secrets/dist_beta_watch_app.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_beta_watch_app_extension.mobileprovision.gpg b/.github/secrets/dist_beta_watch_app_extension.mobileprovision.gpg deleted file mode 100644 index db1e12792..000000000 Binary files a/.github/secrets/dist_beta_watch_app_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_bitwarden.mobileprovision.gpg b/.github/secrets/dist_bitwarden.mobileprovision.gpg deleted file mode 100644 index 02433fe19..000000000 Binary files a/.github/secrets/dist_bitwarden.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_extension.mobileprovision.gpg b/.github/secrets/dist_extension.mobileprovision.gpg deleted file mode 100644 index fe25aafd8..000000000 Binary files a/.github/secrets/dist_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_share_extension.mobileprovision.gpg b/.github/secrets/dist_share_extension.mobileprovision.gpg deleted file mode 100644 index aca9437c2..000000000 Binary files a/.github/secrets/dist_share_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_watch_app.mobileprovision.gpg b/.github/secrets/dist_watch_app.mobileprovision.gpg deleted file mode 100644 index b7f4d4901..000000000 Binary files a/.github/secrets/dist_watch_app.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/dist_watch_app_extension.mobileprovision.gpg b/.github/secrets/dist_watch_app_extension.mobileprovision.gpg deleted file mode 100644 index cc843f27a..000000000 Binary files a/.github/secrets/dist_watch_app_extension.mobileprovision.gpg and /dev/null differ diff --git a/.github/secrets/google-services.json.gpg b/.github/secrets/google-services.json.gpg deleted file mode 100644 index a999db757..000000000 --- a/.github/secrets/google-services.json.gpg +++ /dev/null @@ -1,3 +0,0 @@ -  KY#(EI֐߄T?)l"=|'em/~' F>lb[+RiL"~V:paڵel%8t튖y> $GITHUB_STEP_SUMMARY @@ -141,13 +144,10 @@ jobs: - name: Update Entitlements run: | - echo "########################################" echo "##### Updating Entitlements" - echo "########################################" perl -0777 -pi.bak -e 's/aps-environment<\/key>\s*development<\/string>/aps-environment<\/key>\n\tbeta<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist - - + - name: Set up Keychain env: KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }} @@ -170,8 +170,8 @@ jobs: BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden.mobileprovision EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_extension.mobileprovision SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_share_extension.mobileprovision - WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_beta_watch_app.mobileprovision - WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_watch_app_extension.mobileprovision + WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app.mobileprovision + WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app_extension.mobileprovision PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles mkdir -p "$PROFILES_DIR_PATH" @@ -197,46 +197,36 @@ jobs: - name: Restore packages run: | dotnet restore - dotnet build.cake --target iOS --variant beta - name: Bulid WatchApp run: | - echo "########################################" echo "##### Build WatchApp with Release Configuration" - echo "########################################" xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden - echo "########################################" echo "##### Done" - echo "########################################" + + - name: Setup iOS build CAKE (Testing) + run: dotnet cake build.cake --target iOS --variant beta - name: Archive Build for App Store + shell: pwsh run: | - Write-Output "########################################" Write-Output "##### Archive for Release ios-arm64 - Write-Output "########################################" dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false - Write-Output "########################################" Write-Output "##### Done" - Write-Output "########################################" - shell: pwsh - name: Archive Build for Mobile Automation + shell: pwsh run: | - Write-Output "########################################" Write-Output "##### Archive Debug for iossimulator-x64 - Write-Output "########################################" dotnet build ${{ env.main_app_project_path }} -c Debug -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-x64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false - Write-Output "########################################" Write-Output "##### Done" - Write-Output "########################################" ls ~/Library/Developer/Xcode/Archives - shell: pwsh - name: Export .ipa for App Store run: | @@ -311,9 +301,7 @@ jobs: # || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) # || github.ref == 'refs/heads/hotfix-rc' run: | - echo "########################################" echo "##### Uploading Watch dSYMs to Firebase" - echo "########################################" find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \;