Allow pulumi/pulumi 1.x and 2.x to be used SxS
Fixes
@@ -170,8 +170,8 @@ func compatibleVersions(a, b semver.Version) (bool, string) {
return false, "Differing major or minor versions are not supported."
}
- case a.Major >= 1 && b.Major >= 1:
- // If both major versions are post-1.0, we require that the major versions match.
+ case a.Major >= 2 && b.Major >= 2:
+ // If both major versions are post-2.0, we require that the major versions match.
if a.Major != b.Major {
return false, "Differing major versions are not supported."
}
@@ -179,6 +179,9 @@ func compatibleVersions(a, b semver.Version) (bool, string) {
case a.Major == 1 && b.Major == 0 && b.Minor == 17 || b.Major == 1 && a.Major == 0 && a.Minor == 17:
// If one version is pre-1.0 and the other is post-1.0, we unify 1.x.y and 0.17.z. This combination is legal.
+ case (a.Major == 1 && b.Major == 2) || (a.Major == 2 && b.Major == 1):
+ // If one version is 1.0 and the other is 2.0, we unify 1.x and 2.x. This combination is legal.
+
default:
// All other combinations of versions are illegal.
return false, "Differing major or minor versions are not supported."
