Skip to content

Commit 8574e57

Browse files
kaarolchkaarolch
authored
Merge branch 'master' into events_based_aggr
2 parents c077672 + 1d4b6c2 commit 8574e57

18 files changed

Lines changed: 85 additions & 39 deletions

‎.github/actions/dd-token/action.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ inputs:
1010
runs:
1111
using: "composite"
1212
steps:
13+
# Fork PRs don't get `id-token: write`, so federation cannot succeed.
14+
# Allow the step to fail and let downstream steps run without DD credentials.
1315
- name: Federate Datadog token
1416
id: dd-sts
17+
continue-on-error: true
1518
uses: DataDog/dd-sts-action@2e8187910199bd93129520183c093e19aa585c75
1619
with:
1720
policy: ${{ inputs.policy }}
@@ -22,7 +25,9 @@ runs:
2225
DD_STS_API_KEY: ${{ steps.dd-sts.outputs.api_key }}
2326
DD_STS_APP_KEY: ${{ steps.dd-sts.outputs.app_key }}
2427
run: |
25-
echo "DD_API_KEY=${DD_STS_API_KEY}" >> "$GITHUB_ENV"
28+
if [ -n "${DD_STS_API_KEY}" ]; then
29+
echo "DD_API_KEY=${DD_STS_API_KEY}" >> "$GITHUB_ENV"
30+
fi
2631
if [ -n "${DD_STS_APP_KEY}" ]; then
2732
echo "DD_APP_KEY=${DD_STS_APP_KEY}" >> "$GITHUB_ENV"
2833
fi

‎.github/dependabot.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,19 @@ updates:
176176
npm_and_yarn:
177177
patterns:
178178
- "*"
179+
- package-ecosystem: "npm"
180+
directory: "/scripts/environment/npm-tools"
181+
schedule:
182+
interval: "monthly"
183+
time: "05:00" # UTC
184+
labels:
185+
- "domain: deps"
186+
- "no-changelog"
187+
commit-message:
188+
prefix: "chore(deps)"
189+
# Disable version updates; security updates bypass this limit
190+
open-pull-requests-limit: 0
191+
groups:
192+
npm_and_yarn:
193+
patterns:
194+
- "*"

‎.github/workflows/add_wip_label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Check member review state
2121
id: check
22-
uses: actions/github-script@v7
22+
uses: actions/github-script@v9
2323
with:
2424
script: |
2525
const { data: reviews } = await github.rest.pulls.listReviews({

‎.github/workflows/changes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ jobs:
422422
echo "any=$any_changed" >> $GITHUB_OUTPUT
423423
424424
- name: Upload JSON artifact
425-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
425+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
426426
with:
427427
name: int_tests_changes
428428
path: int_tests_changes.json
@@ -484,7 +484,7 @@ jobs:
484484
echo "any=$any_changed" >> $GITHUB_OUTPUT
485485
486486
- name: Upload JSON artifact
487-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
487+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
488488
with:
489489
name: e2e_tests_changes
490490
path: e2e_tests_changes.json

‎.github/workflows/check_generated_vrl_docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
&& steps.last-commit.outputs.is-auto != 'true'
115115
&& github.event_name == 'pull_request'
116116
&& steps.push.outcome != 'success'
117-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
117+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
118118
with:
119119
name: vrl-docs-check-pr
120120
path: /tmp/docs-check/pr-number

‎.github/workflows/check_generated_vrl_docs_comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
github-token: ${{ github.token }}
2727

2828
- name: Comment on PR
29-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
29+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
3030
with:
3131
script: |
3232
const fs = require('fs');

‎.github/workflows/create_preview_sites.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
steps:
3939
# Get the artifacts with the PR number and branch name
4040
- name: Download artifact
41-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
41+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
4242
with:
4343
script: |
4444
const fs = require('fs');
@@ -58,7 +58,7 @@ jobs:
5858
5959
# Extract the info from the artifact and set variables
6060
- name: Extract PR info from artifact
61-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
61+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
6262
with:
6363
script: |
6464
const fs = require('fs');
@@ -85,7 +85,7 @@ jobs:
8585
8686
# Validate the integrity of the artifact
8787
- name: Validate Artifact Integrity
88-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
88+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
8989
with:
9090
script: |
9191
const crypto = require('crypto');
@@ -104,7 +104,7 @@ jobs:
104104
105105
# Kick off the job in amplify
106106
- name: Deploy Site
107-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
107+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
108108
env:
109109
APP_ID: ${{ inputs.APP_ID }}
110110
APP_NAME: ${{ inputs.APP_NAME }}
@@ -171,7 +171,7 @@ jobs:
171171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
172172
APP_ID: ${{ inputs.APP_ID }}
173173
APP_NAME: ${{ inputs.APP_NAME }}
174-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
174+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
175175
with:
176176
script: |
177177
const fs = require('fs');

‎.github/workflows/cross.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# aarch64 and musl in particular are notoriously hard to link.
5656
# While it may be tempting to slot a `check` in here for quickness, please don't.
5757
- run: make cross-build-${{ matrix.target }}
58-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
58+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5959
with:
6060
name: "vector-debug-${{ matrix.target }}"
6161
path: "./target/${{ matrix.target }}/debug/vector"

‎.github/workflows/k8s_e2e.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595

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

98-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
98+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9999
with:
100100
name: e2e-test-deb-package
101101
path: target/artifacts/*
@@ -116,7 +116,7 @@ jobs:
116116
outputs:
117117
matrix: ${{ steps.set-matrix.outputs.matrix }}
118118
steps:
119-
- uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
119+
- uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
120120
id: set-matrix
121121
with:
122122
script: |

‎.github/workflows/preview_site_trigger.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Save PR information (only if branch is valid)
3333
- name: Validate and save PR information
3434
if: steps.validate.outputs.valid == 'true'
35-
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
35+
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
3636
with:
3737
script: |
3838
const fs = require('fs').promises;
@@ -54,7 +54,7 @@ jobs:
5454
# Upload the artifact using latest version (only if branch is valid)
5555
- name: Upload PR information artifact
5656
if: steps.validate.outputs.valid == 'true'
57-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
57+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5858
with:
5959
name: pr
6060
path: pr/

0 commit comments

Comments
 (0)