Skip to content
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

Jump to bottom

sdk: Use new manifests location #470

Open
wants to merge 1 commit into
base: flatcar-master
Choose a base branch
from
Open

sdk: Use new manifests location #470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions sdk/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,15 @@ func OSRelease(root string) (ver Versions, err error) {
}

func SetManifestSDKVersion(version string) error {
versionPath := filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt")
versionPath := filepath.Join(RepoRoot(), "src", "scripts", "manifests", "version.txt")
originalContent, err := ioutil.ReadFile(versionPath)
if err != nil {
return err
// Try old location.
versionPath = filepath.Join(RepoRoot(), ".repo", "manifests", "version.txt")
originalContent, err = ioutil.ReadFile(versionPath)
if err != nil {
return err
}
}

re := regexp.MustCompile(`FLATCAR_SDK_VERSION=.*`)
Expand Down Expand Up @@ -123,7 +128,11 @@ func VersionsFromDir(dir string) (ver Versions, err error) {
}

func VersionsFromManifest() (Versions, error) {
return VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests"))
versions, err := VersionsFromDir(filepath.Join(RepoRoot(), "src", "scripts", "manifests"))
if err != nil {
versions, err = VersionsFromDir(filepath.Join(RepoRoot(), ".repo", "manifests"))
}
return versions, err
}

func versionsFromRemoteRepoMaybeVerify(url, branch string, verify bool) (ver Versions, err error) {
Expand Down