diff --git a/.github/scripts/ios/deploy-app-store.ps1 b/.github/scripts/ios/deploy-app-store.ps1 index cd3933b50..f669599d3 100644 --- a/.github/scripts/ios/deploy-app-store.ps1 +++ b/.github/scripts/ios/deploy-app-store.ps1 @@ -1,5 +1,5 @@ $rootPath = $env:GITHUB_WORKSPACE; -$ipaPath = "$rootPath/Bitwarden.ipa" +$ipaPath = "$rootPath/bitwarden-export/Bitwarden.ipa" xcrun altool --upload-app --type ios --file "$ipaPath" ` --username "$env:APPLE_ID_USERNAME" --password "$env:APPLE_ID_PASSWORD" diff --git a/.github/scripts/ios/export-ipa.ps1 b/.github/scripts/ios/export-ipa.ps1 index ba051fa6e..5dcc885ab 100644 --- a/.github/scripts/ios/export-ipa.ps1 +++ b/.github/scripts/ios/export-ipa.ps1 @@ -7,12 +7,7 @@ $rootPath = $env:GITHUB_WORKSPACE; $homePath = Resolve-Path "~" | Select-Object -ExpandProperty Path $exportOptionsPath = "$rootPath/.github/resources/export-options-$method.plist"; -$archiveBasePath = "$homePath/Library/Developer/Xcode/Archives/*"; -$archivePath = "$archiveBasePath/*.xcarchive"; -$exportPath = "$rootPath/bitwardenios"; +$archivePath = "$homePath/Library/Developer/Xcode/Archives/*/*.xcarchive"; +$exportPath = "$rootPath/bitwarden-export"; xcodebuild -exportArchive -archivePath $archivePath -exportPath $exportPath -exportOptionsPlist $exportOptionsPath - -ls -cd $exportPath -ls diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19a0bca85..40fd7dc82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -179,8 +179,8 @@ jobs: if: github.ref == 'refs/heads/master' uses: actions/upload-artifact@v2 with: - name: com.8bit.bitwarden.ipa - path: ./com.8bit.bitwarden.ipa + name: Bitwarden.ipa + path: ./bitwarden-export/Bitwarden.ipa - name: Deploy to App Store if: github.ref == 'refs/heads/master'