Skip to content

Commit 718b502

Browse files
committed
Merge branch 'master' into events_based_aggr
2 parents 0942121 + e1c6139 commit 718b502

188 files changed

Lines changed: 3985 additions & 1419 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/ISSUE_TEMPLATE/minor-release.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ Automated steps include:
7171
# On the day of release
7272

7373
- [ ] Make sure the release branch is in sync with origin/master and has only one squashed commit with all commits from the prepare branch. If you made a PR from the prepare branch into the release branch this should already be the case.
74-
- [ ] `git checkout "${RELEASE_BRANCH}"`
74+
- [ ] `git fetch origin`
75+
- [ ] `git checkout "${RELEASE_BRANCH}" && git pull --ff-only origin "${RELEASE_BRANCH}"`
7576
- [ ] `git show --stat HEAD` - This should show the squashed prepare commit.
7677
- [ ] Ensure release date in `website/cue/reference/releases/0.XX.Y.cue` matches current date.
7778
- If this needs to be updated commit and squash it in the release branch.
@@ -88,7 +89,7 @@ Automated steps include:
8889
- [ ] Wait for release workflow to complete.
8990
- Discoverable via [release.yml](https://github.com/vectordotdev/vector/actions/workflows/release.yml)
9091
- [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
91-
- [ ] `git switch website && git reset --hard origin/"${RELEASE_BRANCH}" && git push`
92+
- [ ] `git fetch origin && git switch website && git reset --hard origin/"${RELEASE_BRANCH}" && git push --force-with-lease`
9293
- [ ] Confirm that the release changelog was published to https://vector.dev/releases/
9394
- Refer to the internal releasing doc to monitor the deployment.
9495
- [ ] Release Linux packages. Refer to the internal releasing doc.

.github/ISSUE_TEMPLATE/patch-release.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ export PREP_BRANCH=prepare-v-0-"${CURRENT_MINOR_VERSION}"-"${NEW_PATCH_VERSION}"
6262
- Follow the [instructions at the top of the mirror.yaml file](https://github.com/DataDog/images/blob/fbf12868e90d52e513ebca0389610dea8a3c7e1a/mirror.yaml#L33-L49).
6363
- [ ] Cherry-pick any release commits from the release branch that are not on `master`, to `master`
6464
- [ ] Reset the `website` branch to the `HEAD` of the release branch to update https://vector.dev
65-
- [ ] `git checkout website && git reset --hard origin/"${RELEASE_BRANCH}" && git push`
65+
- [ ] `git fetch origin && git checkout website && git reset --hard origin/"${RELEASE_BRANCH}" && git push --force-with-lease`
6666
- [ ] Kick-off post-mortems for any regressions resolved by the release

.github/actions/setup/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,10 +237,10 @@ runs:
237237
echo "Installing cue"
238238
TEMP=$(mktemp -d)
239239
curl \
240-
-L https://github.com/cue-lang/cue/releases/download/v0.10.0/cue_v0.10.0_linux_amd64.tar.gz \
241-
-o "${TEMP}/cue_v0.10.0_linux_amd64.tar.gz"
240+
-L https://github.com/cue-lang/cue/releases/download/v0.16.1/cue_v0.16.1_linux_amd64.tar.gz \
241+
-o "${TEMP}/cue_v0.16.1_linux_amd64.tar.gz"
242242
tar \
243-
-xvf "${TEMP}/cue_v0.10.0_linux_amd64.tar.gz" \
243+
-xvf "${TEMP}/cue_v0.16.1_linux_amd64.tar.gz" \
244244
-C "${TEMP}"
245245
sudo cp "${TEMP}/cue" /usr/bin/cue
246246
rm -rf "$TEMP"

.github/actions/spelling/expect.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ mezmo
350350
mfoo
351351
mgmt
352352
MIDP
353+
mij
353354
mingrammer
354355
mkto
355356
mlua

.github/workflows/cross.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ jobs:
5757
- run: make cross-build-${{ matrix.target }}
5858
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5959
with:
60-
name: "vector-debug-${{ matrix.target }}"
61-
path: "./target/${{ matrix.target }}/debug/vector"
60+
name: "vector-${{ matrix.target }}"
61+
path: "./target/${{ matrix.target }}/release/vector"

.github/workflows/remove_wip_label.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Remove Work In Progress Label
22

33
permissions:
4+
issues: write
45
pull-requests: write
56

67
on:

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ jobs:
121121
rust: true
122122
cue: true
123123
- run: make check-docs
124+
- name: Check Cue website build
125+
run: cd website && make cue-build
124126

125127
check-markdown:
126128
name: Check Markdown

0 commit comments

Comments
 (0)