-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Check all possible output dirs (#61)
3.0.1 release broke builds using cordova-ios<7 (but using cordova>7). Removed the bad version check, while retaining compatibility with cordova-ios 6 and 7.
- Loading branch information
Showing
23 changed files
with
541 additions
and
491 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,9 @@ | ||
| module github.com/bitrise-steplib/steps-cordova-archive | ||
|
|
||
| go 1.16 | ||
| go 1.18 | ||
|
|
||
| require ( | ||
| github.com/bitrise-io/go-steputils v0.0.0-20210514150206-5b6261447e77 | ||
| github.com/bitrise-io/go-utils v0.0.0-20210517121358-79fa64f4a5f6 | ||
| github.com/bitrise-io/go-steputils v1.0.6 | ||
| github.com/bitrise-io/go-utils v1.0.13 | ||
| github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 | ||
| golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect | ||
| golang.org/x/tools v0.1.1 // indirect | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/bitrise-io/go-utils/log" | ||
| "github.com/bitrise-io/go-utils/pathutil" | ||
| ) | ||
|
|
||
| func getIosOutputCandidateDirsPaths(workDir string, target string, configuration string) []string { | ||
| targetPlatform := "iphonesimulator" | ||
| if target == "device" { | ||
| targetPlatform = "iphoneos" | ||
| } | ||
|
|
||
| // disable linting deprecated Title check SA1019 | ||
| cordovaIOS7targetComponent := strings.Title(configuration) + "-" + targetPlatform //nolint:staticcheck | ||
|
|
||
| return []string{ | ||
| filepath.Join(workDir, "platforms", "ios", "build", target), // cordova-ios <7 | ||
| filepath.Join(workDir, "platforms", "ios", "build", cordovaIOS7targetComponent), // cordova-ios =>7 | ||
| } | ||
| } | ||
|
|
||
| func findFirstExistingDir(candidateDirPaths []string) string { | ||
| for _, path := range candidateDirPaths { | ||
| exist, err := pathutil.IsDirExists(path) | ||
| if err != nil { | ||
| log.Warnf("Failed to check if dir (%s) exist: %s", path, err) | ||
| continue | ||
| } | ||
|
|
||
| if exist { | ||
| return path | ||
| } | ||
| } | ||
|
|
||
| return "" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func Test_getIosOutputCandidateDirsPaths(t *testing.T) { | ||
| testCases := []struct { | ||
| name string | ||
| target string | ||
| configuration string | ||
| want []string | ||
| }{ | ||
| { | ||
| name: "Device + debug", | ||
| target: "device", | ||
| configuration: "debug", | ||
| want: []string{ | ||
| "/workdir/platforms/ios/build/device", | ||
| "/workdir/platforms/ios/build/Debug-iphoneos", | ||
| }, | ||
| }, | ||
| { | ||
| name: "Emulator + release", | ||
| target: "emulator", | ||
| configuration: "release", | ||
| want: []string{ | ||
| "/workdir/platforms/ios/build/emulator", | ||
| "/workdir/platforms/ios/build/Release-iphonesimulator", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| got := getIosOutputCandidateDirsPaths("/workdir", tc.target, tc.configuration) | ||
| if len(got) != len(tc.want) { | ||
| t.Fatalf("got len %v not equal to want len %v", got, tc.want) | ||
| } | ||
| for i, wantElem := range tc.want { | ||
| if wantElem != got[i] { | ||
| t.Fatalf("got %v not equal to want %v", got, tc.want) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.