From 26e35ed94503e72834720efdd640aafc0b9d25f7 Mon Sep 17 00:00:00 2001
From: Cody Shepherd <cody.shepherd@gmail.com>
Date: Fri, 10 Sep 2021 08:38:40 -0700
Subject: [PATCH] chore: omit VCS commands for changelog in favor of s3-only
 approach (#22423)

---
 .circleci/config.yml | 5 -----
 .goreleaser.yml      | 2 ++
 CHANGELOG.md         | 5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6f388e6a1a3..1f1407b8e31 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -825,10 +825,5 @@ jobs:
               -- \
               --tag $TIMESTAMP
             echo ${CIRCLE_SHA1} > $COMMIT_FILE_PATH
-            git add CHANGELOG.md $COMMIT_FILE_PATH
-            git config user.email "team-edge@influxdata.com"
-            git config user.name "Edge Team CircleCI Automation"
-            git commit -m "changelog: update $TIMESTAMP [skip ci]"
-            git push origin $CIRCLE_BRANCH
       - store_artifacts:
           path: CHANGELOG.md
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 33acda7e0e0..bdf185135ae 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -91,6 +91,7 @@ blobs:
     folder: "platform/nightlies/"
     extra_files:
       - glob: ./CHANGELOG.md
+      - glob: ./scripts/ci/changelog-commit.txt
   # Duplicating the contents to another folder in the bucket ensures
   # scheme parity with release branches; eventually the artifacts should
   # __only__ appear in the branch-specific folder
@@ -100,6 +101,7 @@ blobs:
     folder: "platform/nightlies/master/"
     extra_files:
       - glob: ./CHANGELOG.md
+      - glob: ./scripts/ci/changelog-commit.txt
 
 checksum:
   name_template: "influxdb2-nightly.sha256"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69de29bb2d..371137e6bbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,5 @@
+The Changelog has moved!
+
+You can find it at the following URL:
+
+https://dl.influxdata.com/platform/nightlies/master/CHANGELOG.md