Skip to content

Fix-migration-repo-check #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noam-codefresh merged 2 commits into from
Dec 10, 2023
Merged

Fix-migration-repo-check #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15335e5
compare orgRepoand branch as well as host
ATGardner Dec 10, 2023
a1f69a9
bumped version to `0.1.56`
ATGardner Dec 10, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=v0.1.55
VERSION=v0.1.56

OUT_DIR=dist
YEAR?=$(shell date +"%Y")
Expand Down
7 changes: 4 additions & 3 deletions cmd/commands/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ func runHelmMigrate(ctx context.Context, opts *MigrateOptions) error {
if isSharedConfigInInstallationRepo(user.ActiveAccount.SharedConfigRepo, runtime.Repo) {
destFs = opts.cloneOpts.FS
}

destCloneOpts := &apgit.CloneOptions{
Provider: user.ActiveAccount.GitProvider.String(),
Repo: *user.ActiveAccount.SharedConfigRepo,
Expand Down Expand Up @@ -643,8 +644,8 @@ func filterStatus(manifest []byte) []byte {
}

func isSharedConfigInInstallationRepo(iscRepo, installationRepo *string) bool {
iscRepoHost, _, _, _, _, _, _ := aputil.ParseGitUrl(*iscRepo)
installationRepoHost, _, _, _, _, _, _ := aputil.ParseGitUrl(*installationRepo)
iscRepoHost, iscOrgRepo, _, iscBranch, _, _, _ := aputil.ParseGitUrl(*iscRepo)
installationRepoHost, installationOrgRepo, _, installationBranch, _, _, _ := aputil.ParseGitUrl(*installationRepo)

return iscRepoHost == installationRepoHost
return iscRepoHost == installationRepoHost && iscOrgRepo == installationOrgRepo && iscBranch == installationBranch
}
4 changes: 2 additions & 2 deletions docs/releases/release_notes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cf version

```bash
# download and extract the binary
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.55/cf-linux-amd64.tar.gz | tar zx
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.56/cf-linux-amd64.tar.gz | tar zx

# move the binary to your $PATH
mv ./cf-linux-amd64 /usr/local/bin/cf
Expand All @@ -36,7 +36,7 @@ cf version

```bash
# download and extract the binary
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.55/cf-darwin-amd64.tar.gz | tar zx
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.56/cf-darwin-amd64.tar.gz | tar zx

# move the binary to your $PATH
mv ./cf-darwin-amd64 /usr/local/bin/cf
Expand Down