Skip to content

Commit 43b4b09

Browse files
authored
Remove project team ID detection (#271)
* Update go-xcode * go mod tidy * Update go-xcode * Define team ID in E2E tests * Update go-xcode (latest master) * Update README, step.yml * Fix YAML lint
1 parent eb2baab commit 43b4b09

File tree

16 files changed

+224
-259
lines changed

16 files changed

+224
-259
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ You can also run this step directly with [Bitrise CLI](https://github.com/bitris
8989
| `passphrase_list` | Passphrases for the provided code signing certificates. Specify as many passphrases as many Code signing certificate URL provided, separated by a pipe (`\|`) character. | required, sensitive | `$BITRISE_CERTIFICATE_PASSPHRASE` |
9090
| `keychain_path` | Path to the Keychain where the code signing certificates will be installed. | required | `$HOME/Library/Keychains/login.keychain` |
9191
| `keychain_password` | Password for the provided Keychain. | required, sensitive | `$BITRISE_KEYCHAIN_PASSWORD` |
92-
| `export_development_team` | The Developer Portal team to use for this export Defaults to the team used to build the archive. | | |
92+
| `export_development_team` | The Developer Portal team to use for this export Defaults to the team used to build the archive. Defining this is also required when Automatic Code Signing is set to `apple-id` and the connected account belongs to multiple teams. | | |
9393
| `compile_bitcode` | For __non-App Store__ exports, should Xcode re-compile the app from bitcode? | required | `yes` |
9494
| `upload_bitcode` | For __App Store__ exports, should the package include bitcode? | required | `yes` |
9595
| `icloud_container_environment` | If the app is using CloudKit, this configures the `com.apple.developer.icloud-container-environment` entitlement. Available options vary depending on the type of provisioning profile used, but may include: `Development` and `Production`. | | |

e2e/bitrise.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ workflows:
137137
- BITRISE_PROJECT_PATH: ios-simple-objc/ios-simple-objc.xcodeproj
138138
- BITRISE_SCHEME: ios-simple-objc
139139
- CODE_SIGNING_METHOD: apple-id
140+
- TEAM_ID: 72SA8V3WYL
140141
- MIN_DAYS_PROFILE_VALID: 0
141142
- IPA_EXPORT_METHOD: development
142143
- LOG_FORMATTER: xcodebuild
@@ -185,6 +186,7 @@ workflows:
185186
- BITRISE_PROJECT_PATH: code-sign-test.xcodeproj
186187
- BITRISE_SCHEME: code-sign-test
187188
- CODE_SIGNING_METHOD: apple-id
189+
- TEAM_ID: 72SA8V3WYL
188190
- MIN_DAYS_PROFILE_VALID: 0
189191
- IPA_EXPORT_METHOD: app-store
190192
- LOG_FORMATTER: xcpretty

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.16
55
require (
66
github.com/bitrise-io/go-steputils v0.0.0-20211205220451-e046db274afb
77
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420
8-
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d
8+
github.com/bitrise-io/go-xcode v0.0.0-20211213084300-055f09f99a30
99
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8 // indirect
1010
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
1111
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51

go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ github.com/bitrise-io/go-utils v0.0.0-20210924090918-3e7a04d0da9d/go.mod h1:Vi4M
77
github.com/bitrise-io/go-utils v0.0.0-20211008161027-fa11986847a0/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
88
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420 h1:cbKXuIhwfZzPgvuSCvEtmWxBWSk70Vivj78cOMVWgUg=
99
github.com/bitrise-io/go-utils v0.0.0-20211126092127-3a566ee3f420/go.mod h1:Vi4MHnaZVL3PVoPPA/Yp6g2pzntkDH8LGiRSY7qw6KQ=
10-
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d h1:YBG2HuwfQWKumkqSnYEYIqcowpMQfwLqVd/BQw+Q5XA=
11-
github.com/bitrise-io/go-xcode v0.0.0-20211203163621-99a08cd4c73d/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
10+
github.com/bitrise-io/go-xcode v0.0.0-20211209092209-c3c81d943b57 h1:u1t34hs73WBKE3U7B+1WHCejqgeQaQVO1ZXQnZElTro=
11+
github.com/bitrise-io/go-xcode v0.0.0-20211209092209-c3c81d943b57/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
12+
github.com/bitrise-io/go-xcode v0.0.0-20211210115659-1e04ed979665 h1:AzWkrNvoBGHm+Nkz/AHJWQdR3Dvb8YZJ6AjatgVszUI=
13+
github.com/bitrise-io/go-xcode v0.0.0-20211210115659-1e04ed979665/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
14+
github.com/bitrise-io/go-xcode v0.0.0-20211213084300-055f09f99a30 h1:PkVrdvYsDZKjAwUdlQfA6sIw/dZII2pAxrdgua5mJXA=
15+
github.com/bitrise-io/go-xcode v0.0.0-20211213084300-055f09f99a30/go.mod h1:Ptio5Y5KeEmLM78dB/atcOl6nXPNDpY0IZF8DwFlBpk=
1216
github.com/bitrise-io/pkcs12 v0.0.0-20210430063833-0da06eb56630/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=
1317
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8 h1:kmvU8AxrNTxXsVPKepBHD8W+eCVmeaKyTkRuUJB2K38=
1418
github.com/bitrise-io/pkcs12 v0.0.0-20211108084543-e52728e011c8/go.mod h1:UiXKNs0essbC14a2TvGlnUKo9isP9m4guPrp8KJHJpU=

step.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ inputs:
273273
274274
Defaults to the team used to build the archive.
275275
276+
Defining this is also required when Automatic Code Signing is set to `apple-id` and the connected account belongs to multiple teams.
277+
276278
- compile_bitcode: "yes"
277279
opts:
278280
category: IPA export configuration

vendor/github.com/bitrise-io/go-xcode/autocodesign/autocodesign.go

Lines changed: 36 additions & 30 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-xcode/autocodesign/certificates.go

Lines changed: 12 additions & 27 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-xcode/autocodesign/errors.go

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

0 commit comments

Comments
 (0)