From 4f5ec619e8f0e7aeabab6c4ab47434fd1b25bc96 Mon Sep 17 00:00:00 2001 From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:38:15 -0600 Subject: [PATCH 1/5] Update RELEASE.md --- RELEASE.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 67d967c..370a7b9 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -54,6 +54,10 @@ If all is green, you should be able to test the new release: ```shell $ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:X.Y.Z ``` +If the release is the latest version, match the version from the latest image +```shell +$ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:latest +``` The docker image release process is more forgiving than releasing jar artifacts. If something goes wrong during this stage, it can easily be corrected. @@ -77,7 +81,10 @@ Typically, the fast-forward be successful during a normal release since the rele In cases where that's not true, there's a good chance that care may be needed to ensure any merge conflicts are handled appropriately. In the case of a patch release, the branch may, or may not, be fast-forwardable. -Use care, and ensure any merge conflicts are handled appropriately before pushing: +Use care, and ensure any merge conflicts are handled appropriately before pushing. + +[!CAUTION] +If the release is a patch on an older release (i.e. not the latest), do not merge the release branch. ```shell $ git checkout main From 2bd5e33079ab59186cb4d118f7d9834ff79485cf Mon Sep 17 00:00:00 2001 From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:40:55 -0600 Subject: [PATCH 2/5] Update RELEASE.md --- RELEASE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 370a7b9..74e606e 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -83,8 +83,7 @@ In cases where that's not true, there's a good chance that care may be needed to In the case of a patch release, the branch may, or may not, be fast-forwardable. Use care, and ensure any merge conflicts are handled appropriately before pushing. -[!CAUTION] -If the release is a patch on an older release (i.e. not the latest), do not merge the release branch. +> :warning: If the release is a patch on an older release (i.e. not the latest), do not merge the release branch. ```shell $ git checkout main From 7d0c01d8d523c848dfbb1a3efaa2d6c07eda7727 Mon Sep 17 00:00:00 2001 From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:42:25 -0600 Subject: [PATCH 3/5] Update RELEASE.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 74e606e..6e0e498 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -83,7 +83,7 @@ In cases where that's not true, there's a good chance that care may be needed to In the case of a patch release, the branch may, or may not, be fast-forwardable. Use care, and ensure any merge conflicts are handled appropriately before pushing. -> :warning: If the release is a patch on an older release (i.e. not the latest), do not merge the release branch. +> :warning: If the release is a patch on an older release (i.e. not the latest), skip the following section. ```shell $ git checkout main From 4e3c150c327bdb319ef11a15acd1fa8d9ead038d Mon Sep 17 00:00:00 2001 From: Stan Brubaker <120737309+stanbrub@users.noreply.github.com> Date: Mon, 10 Jun 2024 19:46:39 -0600 Subject: [PATCH 4/5] Update RELEASE.md --- RELEASE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 6e0e498..39b02a5 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -54,7 +54,8 @@ If all is green, you should be able to test the new release: ```shell $ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:X.Y.Z ``` -If the release is the latest version, match the version from the latest image +Verify that the latest version, which may not be `X.Y.Z`, is correct in the `latest` image. + ```shell $ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:latest ``` @@ -64,7 +65,6 @@ If something goes wrong during this stage, it can easily be corrected. ### 3. Merge release branch to main - During a normal release, follow-up with a fast-forward merge of `release/vX.Y.Z` into `main`. ```shell From 9c32587f46e1a8cb4a4828632b3fde215fa0e3d4 Mon Sep 17 00:00:00 2001 From: Stan Brubaker Date: Thu, 8 May 2025 11:27:09 -0600 Subject: [PATCH 5/5] Update RELEASE.md --- RELEASE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 39b02a5..ecb7898 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -57,7 +57,7 @@ $ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:X.Y.Z Verify that the latest version, which may not be `X.Y.Z`, is correct in the `latest` image. ```shell -$ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:latest +$ docker run --pull=always --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:latest ``` The docker image release process is more forgiving than releasing jar artifacts.