Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into jszwedko/nightly-vrl
Browse files Browse the repository at this point in the history
  • Loading branch information
jszwedko committed Oct 3, 2024
2 parents b3468b7 + 3082187 commit cc72ab4
Show file tree
Hide file tree
Showing 194 changed files with 4,422 additions and 2,300 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/minor-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ labels: "domain: releasing"

The week before the release:

- [ ] Check for any outstanding deprecation actions in [DEPRECATIONS.md](docs/DEPRECATIONS.md) and
- [ ] Check for any outstanding deprecation actions in [DEPRECATIONS.md](https://github.com/vectordotdev/vector/blob/master/docs/DEPRECATIONS.md) and
take them (or have someone help you take them)
- [ ] Create a new release branch from master to freeze commits
- `git fetch && git checkout origin/master && git checkout -b v0.<new version number> && git push -u`
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/patch-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@ Before the release:
- `git fetch && git checkout v0.<current minor version> && git checkout -b prepare-v0.<new version number>`
- [ ] Cherry-pick in all commits to be released from the associated release milestone
- If any merge conflicts occur, attempt to solve them and if needed enlist the aid of those familiar with the conflicting commits.
- [ ] Bump the release number in the `Cargo.toml` to the current version number
- [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release
- [ ] Add `changelog` key to generated cue file
- [ ] Add description key to the generated cue file with a description of the release (see
previous releases for examples).
- [ ] Update version number in `distribution/install.sh`
- [ ] Add new version to `website/cue/reference/versions.cue`
- [ ] Create new release md file by copying an existing one in `./website/content/en/releases/` and
updating version number
- [ ] Bump the release number in the `Cargo.toml` to the current version number
- [ ] Run `cargo check` to regenerate `Cargo.lock` file
- [ ] Commit these changes
- [ ] Open PR against the release branch (`v0.<new version number>`) for review
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ timeframe
timeseries
timespan
timestamped
typesense
tzdata
ubuntu
upstreaminfo
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,5 @@
^\Qwebsite/cue/reference/remap/functions/ip_pton.cue\E$
^\Qwebsite/layouts/shortcodes/config/unit-tests.html\E$
^lib/codecs/tests/data/native_encoding/
^\Qwebsite/config.toml\E$
ignore$
10 changes: 5 additions & 5 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ amzn
anchore
androideabi
andy
anonymousip
ansicpg
anumber
anycondition
Expand Down Expand Up @@ -569,6 +568,7 @@ jtype
juchiast
karppila
kartar
kebabcase
kemmer
kernelmode
keybase
Expand Down Expand Up @@ -630,7 +630,6 @@ losslessly
lpop
lpush
Luc
luciofranco
lucperkins
lukesteensen
macports
Expand Down Expand Up @@ -682,7 +681,6 @@ mlua
mmdb
Mmm
moby
mockwatchlogs
modulesloaddir
mooper
moosh
Expand Down Expand Up @@ -781,7 +779,7 @@ nullishness
numbackends
oahd
oap
oidc
OIDC
OKD
omfwd
omitempty
Expand Down Expand Up @@ -819,6 +817,7 @@ paq
parallelizable
pareto
partitionable
pascalcase
passthrough
pathbuf
pathgen
Expand Down Expand Up @@ -952,6 +951,7 @@ sccache
schemaless
schemars
schoen
screamingsnakecase
sda
sdata
SDID
Expand Down Expand Up @@ -1158,6 +1158,7 @@ undertagline
underutilized
underutilizing
unevictable
unflatten
unioning
unitdir
unmark
Expand Down Expand Up @@ -1206,7 +1207,6 @@ walkthrough
waninfo
wasmtime
watchexec
watchlogs
wayfor
webgraphviz
webpki
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
org.opencontainers.image.title=Vector development environment
org.opencontainers.image.url=https://github.com/vectordotdev/vector
- name: Build and push
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: .
file: ./scripts/environment/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
)
timeout-minutes: 90
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: "recursive"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/protobuf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
# Run `git checkout`
- uses: actions/checkout@v3
# Install the `buf` CLI
- uses: bufbuild/buf-setup-action@v1.38.0
- uses: bufbuild/buf-setup-action@v1.43.0
# Perform breaking change detection against the `master` branch
- uses: bufbuild/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ jobs:
uses: docker/[email protected]

- name: Build 'vector' target image
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: baseline-vector/
cache-from: type=gha
Expand Down Expand Up @@ -300,7 +300,7 @@ jobs:
uses: docker/[email protected]

- name: Build 'vector' target image
uses: docker/build-push-action@v6.7.0
uses: docker/build-push-action@v6.9.0
with:
context: comparison-vector/
cache-from: type=gha
Expand Down
Loading

0 comments on commit cc72ab4

Please sign in to comment.