Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 32 additions & 28 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,19 @@

[[constraint]]
name = "github.com/spf13/cobra"
version = "0.0.4"
version = "0.0.5"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.3.0"
version = "1.4.0"

# Could not introduce github.com/bitrise-io/go-xcode@master,
# as it has a dependency on github.com/ryanuber/go-glob with
# constraint ^1.0.0, which has no overlap with existing
# constraint master from github.com/bitrise-io/bitrise@1.31.0
[[override]]
name = "github.com/ryanuber/go-glob"
version = "1.0.0"

[prune]
go-tests = true
Expand Down
11 changes: 10 additions & 1 deletion bitriseio/bitrise/certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,16 @@ func (client *Client) GetUploadedCertificatesSerialby(identitySlug string) (cert
var serialList []big.Int

for _, certificate := range certificates {
serialList = append(serialList, *certificate.SerialNumber)
var (
serial big.Int
base = 10
)

if serialRef, ok := serial.SetString(certificate.Serial, base); ok {
serialList = append(serialList, *serialRef)
} else {
log.Warnf("Error converting serial ID (%s) with base (%d): ", certificate.Serial, base)
}
}
return serialList, nil
}
Expand Down
2 changes: 1 addition & 1 deletion codesign/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func InstalledCertificates(certType certificateType) ([]certificateutil.Certific
}
}

return certificateutil.FilterValidCertificateInfos(certs), nil
return certificateutil.FilterValidCertificateInfos(certs).ValidCertificates, nil
}

// IsDistributionCertificate returns true if the given certificate
Expand Down
6 changes: 3 additions & 3 deletions codesigndoc/codesigngroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import (
"sort"
"strings"

"github.com/bitrise-io/codesigndoc/codesign"
"github.com/bitrise-io/go-utils/colorstring"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/goinp/goinp"
"github.com/bitrise-io/codesigndoc/codesign"
"github.com/bitrise-io/go-xcode/certificateutil"
"github.com/bitrise-io/go-xcode/export"
"github.com/bitrise-io/go-xcode/exportoptions"
"github.com/bitrise-io/go-xcode/profileutil"
"github.com/bitrise-io/go-xcode/xcarchive"
"github.com/bitrise-io/goinp/goinp"
)

// extractCertificatesAndProfiles returns the certificates and provisioning profiles of the given codesign group
Expand Down Expand Up @@ -410,7 +410,7 @@ func collectExportCodeSignGroups(archive Archive, installedCertificates []certif
log.Errorf("Failed to read installed Installer certificates, error: %s", err)
}

installedInstallerCertificates = certificateutil.FilterValidCertificateInfos(installedInstallerCertificates)
installedInstallerCertificates = certificateutil.FilterValidCertificateInfos(installedInstallerCertificates).ValidCertificates

log.Debugf("\n")
log.Debugf("Installed installer certificates:")
Expand Down
4 changes: 2 additions & 2 deletions codesigndocuitests/codesigngroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (
"sort"
"strings"

"github.com/bitrise-io/codesigndoc/codesign"
"github.com/bitrise-io/go-utils/colorstring"
"github.com/bitrise-io/go-utils/log"
"github.com/bitrise-io/goinp/goinp"
"github.com/bitrise-io/codesigndoc/codesign"
"github.com/bitrise-io/go-xcode/certificateutil"
"github.com/bitrise-io/go-xcode/export"
"github.com/bitrise-io/go-xcode/exportoptions"
"github.com/bitrise-io/go-xcode/plistutil"
"github.com/bitrise-io/go-xcode/profileutil"
"github.com/bitrise-io/goinp/goinp"
)

// extractCertificatesAndProfiles returns the certificates and provisioning profiles of the given codesign group
Expand Down
37 changes: 36 additions & 1 deletion vendor/github.com/bitrise-io/bitrise-init/models/option.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading