From 72cef509ea2428416c927d33e49bdb3d12517be8 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Wed, 10 Jul 2024 15:36:21 -0400 Subject: [PATCH] chore(ci): Have Vector `master` use `main` of VRL So that nightly releases can you unreleased VRL changes for testing. This was requested by a user. I can see the usefulness to be able to validate VRL changes without having to build Vector. As part of the release, we'll switch it to the latest released version (which should be the same SHA). Signed-off-by: Jesse Szwedko --- .github/ISSUE_TEMPLATE/minor-release.md | 1 + Cargo.lock | 3 +-- Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md index 8c82e25067c71..c5f8a5532ff18 100644 --- a/.github/ISSUE_TEMPLATE/minor-release.md +++ b/.github/ISSUE_TEMPLATE/minor-release.md @@ -13,6 +13,7 @@ The week before the release: - `git fetch && git checkout origin/master && git checkout -b v0. && git push -u` - [ ] Create a new release preparation branch from `master` - `git checkout -b prepare-v0. && git push -u` +- [ ] Pin VRL to latest released version rather than `main` - [ ] Check if there is a newer version of Alpine or Debian available to update the release images in `distribution/docker/`. Update if so. - [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release diff --git a/Cargo.lock b/Cargo.lock index d8d7c7765774a..deea572cd779b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10781,8 +10781,7 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15cfe4fd97ec24cb530d5a3f3896777bd1f9a732ed7982b7a261fc46a5dc4f0a" +source = "git+https://github.com/vectordotdev/vrl?branch=main#17c3471d42f202da2c4ad9f1903bad6ed254837c" dependencies = [ "aes", "ansi_term", diff --git a/Cargo.toml b/Cargo.toml index 9ff1987364bf8..c7264e4e1a169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -138,7 +138,7 @@ proptest-derive = { version = "0.4.0" } serde_json = { version = "1.0.120", default-features = false, features = ["raw_value", "std"] } serde = { version = "1.0.204", default-features = false, features = ["alloc", "derive", "rc"] } toml = { version = "0.8.14", default-features = false, features = ["display", "parse"] } -vrl = { version = "0.16.1", features = ["arbitrary", "cli", "test", "test_framework"] } +vrl = { git = "https://github.com/vectordotdev/vrl", branch = "main", features = ["arbitrary", "cli", "test", "test_framework"] } [dependencies] pin-project.workspace = true