Skip to content

chore(releasing): Fix release channels #17133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jszwedko merged 3 commits into from
Apr 12, 2023
Merged

chore(releasing): Fix release channels #17133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ac1903
chore(releasing): Fix release channel for S3
jszwedko Apr 12, 2023
7329193
Rename some more instances of `latest` channel
jszwedko Apr 12, 2023
b4f7bdf
One more release channel fix
jszwedko Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/build-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion scripts/release-s3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator Author

@jszwedko jszwedko Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Matches new release channel name (used to be latest).

Copy link
Contributor

@neuronull neuronull Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 when did that channel name change?

Copy link
Collaborator Author

@jszwedko jszwedko Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it was part of #17024 since it unified the channel and mode parameters.

Copy link
Contributor

@neuronull neuronull Apr 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was afraid of that...

VERSION_EXACT="$VERSION"
# shellcheck disable=SC2001
VERSION_MINOR_X="$(echo "$VERSION" | sed 's/\.[0-9]*$/.X/g')"
Expand Down
2 changes: 1 addition & 1 deletion vdev/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion vdev/src/commands/build/publish_metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion vdev/src/commands/release/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down