Skip to content

Commit

Permalink
Merge pull request #6995 from onflow/vishal/cherrypicks_to_master
Browse files Browse the repository at this point in the history
Merging v0.37 changes into master and marking v0.38.0 backward compatible.
  • Loading branch information
vishalchangrani authored Feb 10, 2025
2 parents 6bd6cab + 51d35cf commit 8b1120d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/bootstrap/transit/cmd/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func pull(cmd *cobra.Command, args []string) {
fullOutpath := filepath.Join(flagBootDir, "public-root-information", filepath.Base(file.Name))
fmd5 := utils.CalcMd5(fullOutpath)
// only skip files that have an MD5 hash
if file.MD5 != nil && bytes.Equal(fmd5, file.MD5) {
if len(file.MD5) > 0 && bytes.Equal(fmd5, file.MD5) {
log.Info().Str("source", file.Name).Str("dest", fullOutpath).Msgf("skipping existing file from transit servers")
return
}
Expand Down
1 change: 1 addition & 0 deletions engine/common/version/version_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ var defaultCompatibilityOverrides = map[string]struct{}{
"0.37.18": {},
"0.37.22": {},
"0.37.26": {},
"0.38.0": {},
}

// VersionControl manages the version control system for the node.
Expand Down

0 comments on commit 8b1120d

Please sign in to comment.