chore(releasing): Fix release channels (vectordotdev#17133)

* chore(releasing): Fix release channel for S3 Fixes: vectordotdev#17129 Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * Rename some more instances of `latest` channel Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> * One more release channel fix Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com> --------- Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
aholmberg · Apr 12, 2023 · 58b44e8 · 58b44e8
1 parent cfbf233
commit 58b44e8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
@@ -58,7 +58,7 @@ build() {
 
 echo "Building $REPO:* Docker images"
 
-if [[ "$CHANNEL" == "latest" ]]; then
+if [[ "$CHANNEL" == "release" ]]; then
   VERSION_EXACT="$VERSION"
   # shellcheck disable=SC2001
   VERSION_MINOR_X=$(echo "$VERSION" | sed 's/\.[0-9]*$/.X/g')

diff --git a/scripts/release-s3.sh b/scripts/release-s3.sh
@@ -79,7 +79,7 @@ if [[ "$CHANNEL" == "nightly" ]]; then
     "https://packages.timber.io/vector/nightly/latest/vector-nightly-x86_64-unknown-linux-gnu.tar.gz" \
     "$td_nightly/vector-nightly-x86_64-unknown-linux-gnu.tar.gz"
 
-elif [[ "$CHANNEL" == "latest" ]]; then
+elif [[ "$CHANNEL" == "release" ]]; then
   VERSION_EXACT="$VERSION"
   # shellcheck disable=SC2001
   VERSION_MINOR_X="$(echo "$VERSION" | sed 's/\.[0-9]*$/.X/g')"

diff --git a/vdev/src/app.rs b/vdev/src/app.rs
@@ -50,7 +50,7 @@ pub fn version() -> Result<String> {
 
     let channel = util::get_channel();
 
-    if channel == "latest" {
+    if channel == "release" {
         let head = util::git_head()?;
         if !head.status.success() {
             let error = String::from_utf8_lossy(&head.stderr);

diff --git a/vdev/src/commands/build/publish_metadata.rs b/vdev/src/commands/build/publish_metadata.rs
@@ -9,7 +9,7 @@ use std::io::{self, Write};
 /// Setting necessary metadata for our publish workflow in CI.
 ///
 /// Responsible for setting necessary metadata for our publish workflow in CI.
-/// Computes the Vector version (from Cargo.toml), the release channel (nightly vs latest), which Cloudsmith
+/// Computes the Vector version (from Cargo.toml), the release channel (nightly vs release), which Cloudsmith
 /// repository to publish to, and more. All of this information is emitted in a way that sets native outputs on the
 /// GitHub Actions workflow step running the script, which can be passed on to subsequent jobs/steps.
 #[derive(clap::Args, Debug)]

diff --git a/vdev/src/commands/release/channel.rs b/vdev/src/commands/release/channel.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 
 use crate::util::get_channel;
 
-/// Provide the release channel (latest/nightly/custom).
+/// Provide the release channel (release/nightly/custom).
 /// This command is intended for use only within GitHub build workflows.
 // This script is used across various release scripts to determine where distribute archives,
 // packages, etc.