Prepare for the next development cycle

timescale · Jan 11, 2023 · f795fe5 · f795fe5
1 parent 148f25d
commit f795fe5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
@@ -32,7 +32,7 @@
 
 ### Create GitHub release notes
 
-[ ] The `goreleaser` GitHub Action will automatically create a new draft release with the generated binaries, docker images, and a changelog attached. When it is created contact PM to validate if release notes are correct and click green publish button.
+  - [ ] The `goreleaser` GitHub Action will automatically create a new draft release with the generated binaries, docker images, and a changelog attached. When it is created contact PM to validate if release notes are correct and click green publish button.
 
 ### Post-release
 
@@ -43,7 +43,6 @@ For major/minor releases:
  - [ ] If there is a hard dependency on promscale_extension version, make sure to modify [pkg/tests/upgrade_tests/upgrade_test.go#getDBImages](https://github.com/timescale/promscale/blob/master/pkg/tests/upgrade_tests/upgrade_test.go#L89-L92) as done in this [commit](https://github.com/timescale/promscale/pull/1516/commits/6e2434d51dfd3e91505049a2828add3266f3e0f8#diff-6343d0a8cf4936b8f948769738eef8b0624d15d13ccc0a53b457e4f5c53b14e6R90-R94) to return timescale image which has the required promscale_extension. Missing to do so will cause `TestUpgradeFromPrev` failure.
  - [ ] Commit: `git commit -a -m "Prepare for the next development cycle"`
  - [ ] Create PR & Merge when ready
- - [ ] Update Promscale docs to point to the latest release as done in this [PR](https://github.com/timescale/docs/pull/1075)
 
 For patch releases:
 

diff --git a/EXTENSION_VERSION b/EXTENSION_VERSION
@@ -1 +1 @@
-0.8.0
+master
diff --git a/pkg/tests/upgrade_tests/upgrade_test.go b/pkg/tests/upgrade_tests/upgrade_test.go
@@ -86,7 +86,12 @@ func getDBImages(extensionState testhelpers.TestOptions, prevPromscaleVersion *s
 		panic("Only use pg12 for upgrade tests")
 	}
 
-	// From Promscale 0.15.0 onwards the minimum extension version is 0.7.0
+	// From Promscale 0.17.0 onwards the minimum extension version is 0.8.0
+	if prevPromscaleVersion != nil && prevPromscaleVersion.GE(semver.MustParse("0.17.0")) {
+		return "timescale/timescaledb-ha:pg" + pgVersion + ".13-ts2.9.1-latest", dockerImageName, nil
+	}
+
+	// From Promscale 0.15.0 to 0.16.0 the minimum extension version is 0.7.0
 	if prevPromscaleVersion != nil && prevPromscaleVersion.GE(semver.MustParse("0.15.0")) {
 		return "timescale/timescaledb-ha:pg" + pgVersion + ".12-ts2.8.1-latest", dockerImageName, nil
 	}

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -38,8 +38,8 @@ var (
 	// It is customary to bump the version by incrementing the numeral after
 	// the `dev` tag. The SQL migration script name must correspond to the /new/ version.
 
-	Promscale                  = "0.17.0"
-	PrevReleaseVersion         = "0.16.0"
+	Promscale                  = "0.18.0-dev"
+	PrevReleaseVersion         = "0.17.0"
 	CommitHash                 = ""      // Comes from -ldflags settings
 	Branch                     = ""      // Comes from -ldflags settings
 	EarliestUpgradeTestVersion = "0.3.0" // 0.3.0 earliest version an image with correct extension versions exists