Skip to content

Commit a0506f5

Browse files
authored
Update go-xcode to pull the fallback profiles fix (#385)
* Update go-xcode to pull the fallback profiles fix * Run test_workspace e2e test on latest stack only * Update go-xcode * Update profile list for fallback profiles test * Fix BITFALL_APPLE_PROVISIONING_PROFILE_URL_LIST env var reference * Update go-xcode * Fix pr suggestion * Cleanup profiles * Update go-xcode
1 parent 928b8a3 commit a0506f5

File tree

43 files changed

+4597
-921
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+4597
-921
lines changed

e2e/bitrise.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ app:
1212
- BITFALL_APPLE_IOS_CERTIFICATE_NOPASSPHRASE_URL: $BITFALL_APPLE_IOS_CERTIFICATE_NOPASSPHRASE_URL
1313
- BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST: $BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST
1414
- BITFALL_APPLE_PROVISIONING_PROFILE_URL_LIST: $BITFALL_APPLE_PROVISIONING_PROFILE_URL_LIST
15+
- BITFALL_APPLE_FALLBACK_PROVISIONING_PROFILE_URL: $BITFALL_APPLE_FALLBACK_PROVISIONING_PROFILE_URL
1516

1617
- BITFALL_APPSTORECONNECT_API_KEY_URL: $BITFALL_APPSTORECONNECT_API_KEY_URL
1718
- BITFALL_APPSTORECONNECT_API_KEY_ID: $BITFALL_APPSTORECONNECT_API_KEY_ID
@@ -197,7 +198,7 @@ workflows:
197198
- MIN_DAYS_PROFILE_VALID: 0
198199
- IPA_EXPORT_METHOD: development
199200
- LOG_FORMATTER: xcodebuild
200-
- FALLBACK_PROFILES: $BITFALL_APPLE_PROVISIONING_PROFILE_URL_LIST
201+
- FALLBACK_PROFILES: $BITFALL_APPLE_FALLBACK_PROVISIONING_PROFILE_URL
201202
after_run:
202203
- _invalid_login
203204
- _run
@@ -431,6 +432,16 @@ workflows:
431432
- _check_exported_artifacts
432433

433434
test_workspace:
435+
description: "Running workspace tests on a single stack to avoid 'Communication with Apple failed: A non-HTTP 200 response was received (401) for URL ...'"
436+
steps:
437+
- bitrise-run:
438+
run_if: |-
439+
{{ or (enveq "IS_LATEST_STACK_XCODE" "true") (not .IsCI) }}
440+
inputs:
441+
- workflow_id: utility_test_workspace
442+
- bitrise_config_path: ./e2e/bitrise.yml
443+
444+
utility_test_workspace:
434445
envs:
435446
- TEST_APP_URL: https://github.com/bitrise-samples/sample-apps-ios-workspace-swift.git
436447
- TEST_APP_BRANCH: master
@@ -486,7 +497,8 @@ workflows:
486497
- content: |-
487498
#!/bin/bash
488499
set -ex
489-
rm -rf ~/Library/MobileDevice/Provisioning Profiles
500+
rm -rf "~/Library/MobileDevice/Provisioning Profiles"
501+
rm -rf "~/Library/Developer/Xcode/UserData/Provisioning Profiles"
490502
- git::https://github.com/bitrise-steplib/bitrise-step-simple-git-clone.git:
491503
inputs:
492504
- repository_url: $TEST_APP_URL

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/bitrise-io/go-utils v1.0.14
1010
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23
1111
github.com/bitrise-io/go-xcode v1.3.0
12-
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.58
12+
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.62
1313
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
1414
github.com/stretchr/testify v1.10.0
1515
gopkg.in/yaml.v3 v3.0.1
@@ -22,13 +22,15 @@ require (
2222
github.com/bitrise-io/go-steputils v1.0.6 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
25+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
2526
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
2627
github.com/google/go-cmp v0.6.0 // indirect
2728
github.com/google/go-querystring v1.1.0 // indirect
2829
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
2930
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
3031
github.com/hashicorp/go-version v1.7.0 // indirect
3132
github.com/kr/pretty v0.3.1 // indirect
33+
github.com/mitchellh/mapstructure v1.5.0 // indirect
3234
github.com/pkg/errors v0.9.1 // indirect
3335
github.com/pmezard/go-difflib v1.0.0 // indirect
3436
github.com/rogpeppe/go-internal v1.10.0 // indirect

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23 h1:Dfh4nyZPuEtilBisidejqxBrkx9
1313
github.com/bitrise-io/go-utils/v2 v2.0.0-alpha.23/go.mod h1:3XUplo0dOWc3DqT2XA2SeHToDSg7+j1y1HTHibT2H68=
1414
github.com/bitrise-io/go-xcode v1.3.0 h1:QB8Vyr2oZQro/ocs9DJai80rlYL1hU1kwjHqdGslFLo=
1515
github.com/bitrise-io/go-xcode v1.3.0/go.mod h1:9OwsvrhZ4A2JxHVoEY7CPcABAKA+OE7FQqFfBfvbFuY=
16-
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.58 h1:99BVtam/ViO6DrVLwzfPcWuAeWJhOLPF7LMJ9xmBtMw=
17-
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.58/go.mod h1:zoLzT5fJE8V2SeYq0D0Z+ZN2FAzERjV3uiqDg5H8Bug=
16+
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.62 h1:zQD91SP+IOXi0277jH1rqxxRhRHLLrvfD8kvAA6BTmg=
17+
github.com/bitrise-io/go-xcode/v2 v2.0.0-alpha.62/go.mod h1:rSmzmqVD3Mn9dWwe19qiiGjlvk/At3D8bQh7n9E8S58=
1818
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1919
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2020
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -23,6 +23,8 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
2323
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
2424
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa h1:RDBNVkRviHZtvDvId8XSGPu3rmpmSe+wKRcEWNgsfWU=
2525
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA=
26+
github.com/gofrs/uuid/v5 v5.2.0 h1:qw1GMx6/y8vhVsx626ImfKMuS5CvJmhIKKtuyvfajMM=
27+
github.com/gofrs/uuid/v5 v5.2.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8=
2628
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
2729
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
2830
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -55,6 +57,8 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
5557
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
5658
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
5759
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
60+
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
61+
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
5862
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
5963
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
6064
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

step/step.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
"github.com/bitrise-io/go-xcode/v2/codesign"
3232
"github.com/bitrise-io/go-xcode/v2/devportalservice"
3333
"github.com/bitrise-io/go-xcode/v2/exportoptionsgenerator"
34+
"github.com/bitrise-io/go-xcode/v2/xcarchive"
3435
"github.com/bitrise-io/go-xcode/v2/xcconfig"
3536
cache "github.com/bitrise-io/go-xcode/v2/xcodecache"
3637
"github.com/bitrise-io/go-xcode/v2/xcodecommand"
3738
"github.com/bitrise-io/go-xcode/v2/xcodeversion"
38-
"github.com/bitrise-io/go-xcode/xcarchive"
3939
"github.com/bitrise-io/go-xcode/xcodebuild"
4040
"github.com/kballard/go-shellquote"
4141
)
@@ -786,6 +786,7 @@ func (s XcodebuildArchiveConfigParser) createCodesignManager(config Config) (cod
786786
profiledownloader.New(codesignConfig.FallbackProvisioningProfiles, client),
787787
codesignasset.NewWriter(codesignConfig.Keychain),
788788
localcodesignasset.NewManager(localcodesignasset.NewProvisioningProfileProvider(), localcodesignasset.NewProvisioningProfileConverter()),
789+
localcodesignasset.NewProvisioningProfileConverter(),
789790
project,
790791
s.logger,
791792
), nil

vendor/github.com/bitrise-io/go-utils/v2/analytics/client.go

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/bitrise-io/go-utils/v2/analytics/event.go

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/bitrise-io/go-utils/v2/analytics/property.go

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/bitrise-io/go-utils/v2/analytics/track.go

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)