Skip to content

Commit

Permalink
Step 1840 cleanup (#64)
Browse files Browse the repository at this point in the history
* Remove unused code and update default stacks

* Update codesigndoc dependency

* Pull latest codesigndoc dependency
  • Loading branch information
godrei authored Feb 28, 2022
1 parent ec90c97 commit a81dc7f
Show file tree
Hide file tree
Showing 232 changed files with 13,110 additions and 11,599 deletions.
28 changes: 0 additions & 28 deletions config/stack.go

This file was deleted.

13 changes: 5 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ go 1.16
require (
github.com/Microsoft/go-winio v0.5.0 // indirect
github.com/bitrise-io/bitrise v0.0.0-20210623145422-513e39485248
github.com/bitrise-io/bitrise-init v0.0.0-20220217153511-9fd066eb795f
github.com/bitrise-io/codesigndoc v0.0.0-20210521081848-80756d2c5664
github.com/bitrise-io/bitrise-init v0.0.0-20220223091922-37dca4521588
github.com/bitrise-io/codesigndoc v0.0.0-20220228120027-889a26b5d5c5
github.com/bitrise-io/envman v0.0.0-20210630102032-df85af51bd1a
github.com/bitrise-io/go-steputils v0.0.0-20210527075147-910ce7a105a1 // indirect
github.com/bitrise-io/go-utils v0.0.0-20210713111255-08be784d45d0
github.com/bitrise-io/go-xcode v0.0.0-20210714144817-465637d28b74
github.com/bitrise-io/go-utils v1.0.1
github.com/bitrise-io/go-xcode v1.0.3
github.com/juju/ansiterm v0.0.0-20210706145210-9283cdf370b5 // indirect
github.com/kevinburke/ssh_config v1.1.0 // indirect
github.com/lunixbochs/vtclean v1.0.0 // indirect
Expand All @@ -21,9 +20,7 @@ require (
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
github.com/xanzy/ssh-agent v0.3.0 // indirect
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.4.0
)
63 changes: 26 additions & 37 deletions go.sum

Large diffs are not rendered by default.

18 changes: 0 additions & 18 deletions maintenance/maintenance_test.go

This file was deleted.

1 change: 1 addition & 0 deletions phases/codesign_ios_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func iosCodesign(bitriseYML bitriseModels.BitriseDataModel, searchDir string) (C
archivePath, err := codesigndoc.BuildXcodeArchive(xcode.CommandModel{
ProjectFilePath: projectPathAbs,
Scheme: scheme,
Destination: "generic/platform=iOS",
}, nil)
if err != nil {
return CodesignResultsIOS{}, err
Expand Down
22 changes: 14 additions & 8 deletions phases/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,21 @@ import (
"github.com/manifoldco/promptui"
)

// Based on: https://github.com/bitrise-io/bitrise-website/blob/master/config/available_stacks.yml
const (
defaultMacOSStack = "osx-xcode-13.1.x"
defaultLinuxStack = "linux-docker-android-20.04"
)

var defaultStacks = map[string]string{
"cordova": "osx-xcode-12.4.x",
"react-native": "osx-xcode-12.4.x",
"ionic": "osx-xcode-12.4.x",
"flutter": "osx-xcode-12.4.x",
"android": "linux-docker-android-20.04",
"macos": "osx-xcode-12.4.x",
"ios": "osx-xcode-12.4.x",
"ios": defaultMacOSStack,
"macos": defaultMacOSStack,
"android": defaultLinuxStack,
"cordova": defaultMacOSStack,
"ionic": defaultMacOSStack,
"react-native": defaultMacOSStack,
"flutter": defaultMacOSStack,
"other": defaultLinuxStack,
}

type availableStacksResponse map[string]interface{}
Expand Down Expand Up @@ -64,7 +71,6 @@ func Stack(orgSlug string, apiToken string, projectType string) (string, error)
fmt.Println()
log.Infof("SELECT STACK")
stack := defaultStacks[projectType]
var err error

availableStacks, err := fetchAvailableStacks(orgSlug, apiToken)
if err != nil {
Expand Down
20 changes: 13 additions & 7 deletions vendor/github.com/bitrise-io/bitrise-init/scanners/ios/appclip.go

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

81 changes: 13 additions & 68 deletions vendor/github.com/bitrise-io/bitrise-init/scanners/ios/icon.go

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

Loading

0 comments on commit a81dc7f

Please sign in to comment.