From 2438fb307c8245258c39d0b8fbf31a1a0aa8eada Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Wed, 12 May 2021 14:32:20 -0700
Subject: [PATCH] fix: use next version in changelog

---
 .github/PULL_REQUEST_TEMPLATE/release_template.md | 1 -
 CHANGELOG.md                                      | 6 +++---
 ci/README.md                                      | 7 +++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE/release_template.md b/.github/PULL_REQUEST_TEMPLATE/release_template.md
index 8d7841ebb..1712e320b 100644
--- a/.github/PULL_REQUEST_TEMPLATE/release_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/release_template.md
@@ -12,6 +12,5 @@ Follow "Publishing a release" steps in `ci/README.md`
 
 <!-- Note some of these steps below are redundant since they're listed in the "Publishing a release" docs -->
 
-- [ ] double-check github release tag is the commit with artifacts (_note gets messed up after uploading assets_)
 - [ ] publish release and merge PR
 - [ ] update the AUR package
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00d5f6765..5e4450c84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 # Changelog
 
 - [Changelog](#changelog)
-  - [3.11.0](#3110)
+  - [Next Version](#next-version)
     - [New Features](#new-features)
     - [Bug Fixes](#bug-fixes)
     - [Documentation](#documentation)
@@ -30,7 +30,7 @@ We copy from here into the release notes.
 <!--
 Add next version above previous version but below this line using the template
 
-## 0.0.0
+## Next Version
 
 VS Code v0.00.0
 
@@ -52,7 +52,7 @@ VS Code v0.00.0
 
 -->
 
-## 3.11.0
+## Next Version
 
 VS Code v1.56
 
diff --git a/ci/README.md b/ci/README.md
index e90d9ab1d..c8a8a0ad6 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -24,14 +24,13 @@ Any file or directory in this subdirectory should be documented here.
    - It will upload them to the draft release.
 6. Run some basic sanity tests on one of the released packages.
    - Especially make sure the terminal works fine.
-7. Make sure the github release tag is the commit with the artifacts.
-8. Publish the release and merge the PR.
+7. Publish the release and merge the PR.
    1. CI will automatically grab the artifacts and then:
       1. Publish the NPM package from `npm-package`.
       2. Publish the Docker Hub image from `release-images`.
-9. Update the AUR package.
+8. Update the AUR package.
    - Instructions on updating the AUR package are at [cdr/code-server-aur](https://github.com/cdr/code-server-aur).
-10. Wait for the npm package to be published.
+9. Wait for the npm package to be published.
 
 ## dev