diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75bd47aa22..24b6fd514b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: # These are gitlab variables so that it's easier to do a manual deploy # If these are set witih value and description, then it gives you UI elements DOWNSTREAM_BRANCH: - value: "main" + value: "igor/versioning/back-to-merge" description: "downstream jobs are triggered on this branch" include: diff --git a/Cargo.lock b/Cargo.lock index b0f6e18bfd..d3deec56ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3170,7 +3170,7 @@ dependencies = [ [[package]] name = "libdd-library-config" -version = "1.0.0" +version = "1.1.0" dependencies = [ "anyhow", "libdd-trace-protobuf", diff --git a/libdd-crashtracker/Cargo.toml b/libdd-crashtracker/Cargo.toml index ef930c79b4..4ae0c596da 100644 --- a/libdd-crashtracker/Cargo.toml +++ b/libdd-crashtracker/Cargo.toml @@ -85,3 +85,4 @@ cxx-build = { version = "1.0", optional = true } # Without this, aws-lc-sys gets compiled twice: once for the normal dep graph and once for the # build-script dep graph (Cargo resolver v2 keeps these contexts separate). libdd-common = { version = "2.0.0", path = "../libdd-common", default-features = false } + diff --git a/libdd-library-config/Cargo.toml b/libdd-library-config/Cargo.toml index 2023ee3549..8e3c044c06 100644 --- a/libdd-library-config/Cargo.toml +++ b/libdd-library-config/Cargo.toml @@ -3,7 +3,7 @@ [package] name = "libdd-library-config" -version = "1.0.0" +version = "1.1.0" description = "Configuration management library for Datadog products." homepage = "https://github.com/DataDog/libdatadog/tree/main/libdd-library-config" repository = "https://github.com/DataDog/libdatadog/tree/main/libdd-library-config"