Skip to content

Commit a946993

Browse files
authored
Merge branch 'master' into fix/memory-table-reload-state
2 parents 0bded62 + f60d465 commit a946993

122 files changed

Lines changed: 4507 additions & 289 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
.github/workflows/regression.yml @vectordotdev/vector @vectordotdev/single-machine-performance
44
regression/config.yaml @vectordotdev/vector @vectordotdev/single-machine-performance
55

6+
tests/antithesis/ @vectordotdev/vector @vectordotdev/single-machine-performance
7+
68
website/ @vectordotdev/vector
79
website/js @vectordotdev/vector @vectordotdev/vector-website
810
website/layouts @vectordotdev/vector @vectordotdev/vector-website
@@ -13,5 +15,6 @@ website/* @vectordotdev/vector @vectordotdev/vector-website
1315
# Keep documentation team paths in sync with .github/workflows/add_docs_review_label.yml
1416
/*.md @vectordotdev/vector @vectordotdev/documentation
1517
docs/ @vectordotdev/vector @vectordotdev/documentation
18+
deprecation.d/ @vectordotdev/vector @vectordotdev/documentation
1619
website/content @vectordotdev/vector @vectordotdev/documentation
1720
website/cue/reference @vectordotdev/vector @vectordotdev/documentation

.github/ISSUE_TEMPLATE/minor-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Automated steps include:
6565
- [ ] Ensure any deprecations are highlighted in the release upgrade guide.
6666
- [ ] Review generated changelog entries to ensure they are understandable to end-users.
6767
- [ ] Ensure the date matches the scheduled release date.
68-
- [ ] Add a link to pending deprecation items from [DEPRECATIONS.md](https://github.com/vectordotdev/vector/blob/master/docs/DEPRECATIONS.md).
68+
- [ ] Run `cargo vdev deprecation show --version "${NEW_VECTOR_VERSION}"` to review new deprecation announcements in this release.
6969
- [ ] PR review & approval.
7070

7171
# On the day of release

.github/actions/setup/action.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ inputs:
7373
vdev:
7474
required: false
7575
default: true
76-
description: "Install vdev CLI tool via cargo binstall (uses VDEV_VERSION pinned in prepare.sh)."
76+
description: "Install vdev CLI tool via cargo binstall (version from vdev/Cargo.toml)."
7777

7878
# prepare.sh - npm
7979
markdownlint-cli2:
@@ -134,8 +134,11 @@ runs:
134134
run: echo "::add-matcher::.github/matchers/rust.json"
135135
shell: bash
136136

137+
# Two steps so that the actions/cache post-step (which saves the cache) runs
138+
# directly from this composite, not a nested one — nested composites break
139+
# post-step input resolution (actions/runner#3514, #2030).
137140
- name: Cache Cargo registry, index, and git DB
138-
if: ${{ inputs.cargo-cache == 'true' || env.NEEDS_RUST == 'true' }}
141+
if: ${{ (inputs.cargo-cache == 'true' || env.NEEDS_RUST == 'true') && github.ref == 'refs/heads/master' }}
139142
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
140143
with:
141144
path: |
@@ -146,6 +149,18 @@ runs:
146149
restore-keys: |
147150
${{ runner.os }}-cargo-
148151
152+
- name: Restore Cargo registry, index, and git DB
153+
if: ${{ (inputs.cargo-cache == 'true' || env.NEEDS_RUST == 'true') && github.ref != 'refs/heads/master' }}
154+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
155+
with:
156+
path: |
157+
~/.cargo/registry/index/
158+
~/.cargo/registry/cache/
159+
~/.cargo/git/db/
160+
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
161+
restore-keys: |
162+
${{ runner.os }}-cargo-
163+
149164
- name: Install mold
150165
if: ${{ runner.os == 'Linux' && env.DISABLE_MOLD != 'true' && inputs.mold == 'true' }}
151166
shell: bash
@@ -222,7 +237,7 @@ runs:
222237
- name: Install libsasl2
223238
if: ${{ inputs.libsasl2 == 'true' }}
224239
shell: bash
225-
run: sudo apt-get update && sudo apt-get install -y libsasl2-dev
240+
run: timeout 30m sudo apt-get update && timeout 30m sudo apt-get install -y libsasl2-dev
226241

227242
- name: Cache cargo binaries
228243
id: cache-cargo-binaries
@@ -239,7 +254,7 @@ runs:
239254
~/.cargo/bin/dd-rust-license-tool
240255
~/.cargo/bin/wasm-pack
241256
~/.cargo/bin/vdev
242-
key: ${{ runner.os }}-cargo-binaries-${{ hashFiles('scripts/environment/*.sh') }}
257+
key: ${{ runner.os }}-cargo-binaries-${{ hashFiles('scripts/environment/*.sh', 'vdev/Cargo.toml') }}
243258
restore-keys: |
244259
${{ runner.os }}-cargo-binaries-
245260

.github/workflows/add_docs_review_label.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
paths:
1414
- "*.md"
1515
- "docs/**"
16+
- "deprecation.d/**"
1617
- "website/content/**"
1718
- "website/cue/reference/**"
1819

.github/workflows/changes.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ on:
3434
value: ${{ jobs.source.outputs.dependencies }}
3535
deny:
3636
value: ${{ jobs.source.outputs.deny }}
37+
deprecations:
38+
value: ${{ jobs.source.outputs.deprecations }}
3739
internal_events:
3840
value: ${{ jobs.source.outputs.internal_events }}
3941
cue:
@@ -170,6 +172,7 @@ jobs:
170172
source: ${{ steps.filter.outputs.source }}
171173
dependencies: ${{ steps.filter.outputs.dependencies }}
172174
deny: ${{ steps.filter.outputs.deny }}
175+
deprecations: ${{ steps.filter.outputs.deprecations }}
173176
internal_events: ${{ steps.filter.outputs.internal_events }}
174177
cue: ${{ steps.filter.outputs.cue }}
175178
component_docs: ${{ steps.filter.outputs.component_docs }}
@@ -223,6 +226,12 @@ jobs:
223226
- '**/Cargo.toml'
224227
- 'Cargo.lock'
225228
- ".github/workflows/deny.yml"
229+
deprecations:
230+
- 'deprecation.d/**'
231+
- 'website/data/deprecations.json'
232+
- "vdev/**"
233+
- ".github/workflows/deprecation.yaml"
234+
- ".github/workflows/changes.yml"
226235
cue:
227236
- 'website/cue/**'
228237
- "vdev/**"

.github/workflows/ci-integration-review.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ jobs:
164164
if: steps.run_condition.outputs.should_run == 'true'
165165

166166
- uses: ./.github/actions/setup
167+
if: steps.run_condition.outputs.should_run == 'true'
167168
with:
168169
vdev: true
169170
datadog-ci: true
@@ -222,6 +223,7 @@ jobs:
222223
if: steps.run_condition.outputs.should_run == 'true'
223224

224225
- uses: ./.github/actions/setup
226+
if: steps.run_condition.outputs.should_run == 'true'
225227
with:
226228
vdev: true
227229
datadog-ci: true

.github/workflows/coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: Merge coverage reports
8181
run: |
82-
sudo apt-get install -y --no-install-recommends lcov
82+
timeout 30m sudo apt-get install -y --no-install-recommends lcov
8383
8484
mapfile -t FILES < <(find coverage-artifacts -name '*.info')
8585
echo "Merging ${#FILES[@]} coverage file(s)"

.github/workflows/deprecation.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Deprecation Fragments
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
ref:
7+
description: "Git ref to checkout"
8+
required: false
9+
type: string
10+
11+
workflow_dispatch:
12+
inputs:
13+
ref:
14+
description: "Git ref to checkout"
15+
required: false
16+
type: string
17+
18+
pull_request:
19+
merge_group:
20+
types: [checks_requested]
21+
22+
concurrency:
23+
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
24+
cancel-in-progress: true
25+
26+
permissions:
27+
contents: read
28+
29+
jobs:
30+
changes:
31+
if: ${{ github.event_name == 'pull_request' }}
32+
uses: ./.github/workflows/changes.yml
33+
secrets: inherit
34+
35+
check-deprecations:
36+
runs-on: ubuntu-24.04
37+
timeout-minutes: 10
38+
if: ${{ always() && (github.event_name != 'pull_request' || needs.changes.outputs.deprecations == 'true') }}
39+
needs: [changes]
40+
steps:
41+
- name: Checkout branch
42+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
43+
with:
44+
ref: ${{ inputs.ref }}
45+
fetch-tags: true
46+
47+
- uses: ./.github/actions/setup
48+
with:
49+
vdev: true
50+
mold: false
51+
52+
- name: Check deprecation fragments
53+
run: vdev deprecation check

.github/workflows/install-sh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
with:
2828
ref: ${{ inputs.ref }}
2929

30-
- run: sudo apt-get install --yes bc
30+
- run: timeout 30m sudo apt-get install --yes bc
3131
- run: bash distribution/install.sh -- -y
3232
- run: ~/.vector/bin/vector --version

.github/workflows/k8s_e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
cargo-deb: true
8888

8989
- name: Install packaging dependencies
90-
run: sudo apt-get install -y cmark-gfm
90+
run: timeout 30m sudo apt-get install -y cmark-gfm
9191

9292
- run: VECTOR_VERSION="$(vdev version)" make package-deb-x86_64-unknown-linux-gnu
9393

0 commit comments

Comments
 (0)