Skip to content

Commit 523e0eb

Browse files
authored
Merge branch 'master' into rob/secrets-manager-v1_1
2 parents 477b513 + 717331b commit 523e0eb

File tree

42 files changed

+1516
-234
lines changed

Some content is hidden

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

42 files changed

+1516
-234
lines changed

.github/actions/spelling/allow.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ Lifetouch
292292
linkerd
293293
localdomain
294294
localstack
295+
lookback
295296
lucene
296297
Lumia
297298
LYF

.github/workflows/cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- name: Cache Cargo registry + index
36-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
36+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3737
with:
3838
path: |
3939
~/.cargo/bin/

.github/workflows/cross.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
if: ${{ github.event_name != 'pull_request_review' }}
4545
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4646

47-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
47+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4848
name: Cache Cargo registry + index
4949
with:
5050
path: |

.github/workflows/deny.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
if: ${{ github.event_name != 'pull_request_review' }}
4646
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747

48-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
48+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
4949
name: Cache Cargo registry + index
5050
with:
5151
path: |

.github/workflows/k8s_e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
if: ${{ github.event_name != 'pull_request_review' }}
8787
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8888

89-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
89+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
9090
with:
9191
path: |
9292
~/.cargo/registry

.github/workflows/misc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
test-misc:
1111
runs-on: ubuntu-24.04
12-
timeout-minutes: 60
12+
timeout-minutes: 90
1313
env:
1414
CARGO_INCREMENTAL: 0
1515
steps:
@@ -32,7 +32,7 @@ jobs:
3232
if: ${{ github.event_name != 'pull_request_review' }}
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

35-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
35+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3636
name: Cache Cargo registry + index
3737
with:
3838
path: |

.github/workflows/publish.yml

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

319319
build-x86_64-pc-windows-msvc-packages:
320320
name: Build Vector for x86_64-pc-windows-msvc (.zip)
321-
runs-on: release-builder-windows-2022
321+
runs-on: windows-2025-8core
322322
timeout-minutes: 90
323323
needs: generate-publish-metadata
324324
env:
@@ -333,7 +333,7 @@ jobs:
333333
with:
334334
ref: ${{ inputs.git_ref }}
335335
- name: Bootstrap runner environment (Windows-specific)
336-
run: .\scripts\environment\bootstrap-windows-2022.ps1
336+
run: .\scripts\environment\bootstrap-windows-2025.ps1
337337
- name: Install Wix
338338
shell: bash
339339
run: |

.github/workflows/regression.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: Set SMP version
106106
id: experimental-meta
107107
run: |
108-
export SMP_CRATE_VERSION="0.22.0"
108+
export SMP_CRATE_VERSION="0.24.1"
109109
echo "smp crate version: ${SMP_CRATE_VERSION}"
110110
echo "SMP_CRATE_VERSION=${SMP_CRATE_VERSION}" >> $GITHUB_OUTPUT
111111
@@ -277,7 +277,7 @@ jobs:
277277

278278
- name: Download SMP binary
279279
run: |
280-
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
280+
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-musl/smp ${{ runner.temp }}/bin/smp
281281
282282
##
283283
## SUBMIT
@@ -390,7 +390,7 @@ jobs:
390390

391391
- name: Download SMP binary
392392
run: |
393-
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
393+
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-musl/smp ${{ runner.temp }}/bin/smp
394394
395395
- name: Submit job
396396
env:
@@ -459,7 +459,7 @@ jobs:
459459

460460
- name: Download SMP binary
461461
run: |
462-
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
462+
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-musl/smp ${{ runner.temp }}/bin/smp
463463
464464
- name: Download submission metadata
465465
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -498,7 +498,7 @@ jobs:
498498

499499
- name: Download SMP binary
500500
run: |
501-
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-gnu/smp ${{ runner.temp }}/bin/smp
501+
aws s3 cp s3://smp-cli-releases/v${{ needs.resolve-inputs.outputs.smp-version }}/x86_64-unknown-linux-musl/smp ${{ runner.temp }}/bin/smp
502502
503503
- name: Download submission metadata
504504
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0

.github/workflows/semantic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ jobs:
162162
nats source
163163
new source
164164
nginx_metrics source
165+
okta source
165166
opentelemetry source
166167
postgresql_metrics source
167168
prometheus_remote_write source

.github/workflows/unit_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: ${{ github.event_name != 'pull_request_review' }}
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

35-
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
35+
- uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
3636
name: Cache Cargo registry + index
3737
with:
3838
path: |

0 commit comments

Comments
 (0)