Skip to content

Commit 36dfaa8

Browse files
Merge release-25.11 into staging-next-25.11
2 parents 672becc + 23db6ef commit 36dfaa8

44 files changed

Lines changed: 546 additions & 495 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/workflows/backport.yml

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

5050
- name: Create backport PRs
5151
id: backport
52-
uses: korthout/backport-action@c656f5d5851037b2b38fb5db2691a03fa229e3b2 # v4.0.1
52+
uses: korthout/backport-action@01619ebc9a6e3f6820274221b9956b3e7365000a # v4.1.0
5353
with:
5454
# Config README: https://github.com/korthout/backport-action#backport-action
5555
copy_labels_pattern: 'severity:\ssecurity'

.github/workflows/bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
ci/github-script
5454
5555
- name: Install dependencies
56-
run: npm install @actions/artifact@5.0.3 bottleneck
56+
run: npm install @actions/artifact@5.0.3 bottleneck@2.19.5
5757

5858
# Use a GitHub App, because it has much higher rate limits: 12,500 instead of 5,000 req / hour.
5959
- uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
merged-as-untrusted-at: ${{ inputs.mergedSha }}
6363
target-as-trusted-at: ${{ inputs.targetSha }}
6464

65-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
65+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
6666
with:
6767
# Sandbox is disabled on MacOS by default.
6868
extra_nix_config: sandbox = true

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
ci/github-script
4444
4545
- name: Install dependencies
46-
run: npm install bottleneck
46+
run: npm install bottleneck@2.19.5
4747

4848
- name: Log current API rate limits
4949
env:
@@ -85,7 +85,7 @@ jobs:
8585
merged-as-untrusted-at: ${{ inputs.mergedSha }}
8686
target-as-trusted-at: ${{ inputs.targetSha }}
8787

88-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
88+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
8989

9090
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
9191
continue-on-error: true

.github/workflows/eval.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
core.info(`Found pinned.json commit: ${ciPinBumpCommit}`)
133133
134134
- name: Install Nix
135-
uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
135+
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
136136

137137
- name: Load supported versions
138138
id: versions
@@ -180,7 +180,7 @@ jobs:
180180
target-as-trusted-at: ${{ inputs.targetSha }}
181181

182182
- name: Install Nix
183-
uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
183+
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
184184

185185
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
186186
continue-on-error: true
@@ -270,7 +270,7 @@ jobs:
270270
merge-multiple: true
271271

272272
- name: Install Nix
273-
uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
273+
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
274274

275275
- name: Combine all output paths and eval stats
276276
run: |
@@ -451,7 +451,7 @@ jobs:
451451
merged-as-untrusted-at: ${{ inputs.mergedSha }}
452452

453453
- name: Install Nix
454-
uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
454+
uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
455455

456456
- name: Ensure flake outputs on all systems still evaluate
457457
run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1'

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
merged-as-untrusted-at: ${{ inputs.mergedSha }}
3737

38-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
38+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
3939

4040
# TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
4141
# because the cache would be invalidated on every commit - treefmt checks every file.
@@ -70,7 +70,7 @@ jobs:
7070
with:
7171
merged-as-untrusted-at: ${{ inputs.mergedSha }}
7272

73-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
73+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
7474

7575
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
7676
continue-on-error: true
@@ -100,7 +100,7 @@ jobs:
100100
merged-as-untrusted-at: ${{ inputs.mergedSha }}
101101
target-as-trusted-at: ${{ inputs.targetSha }}
102102

103-
- uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31
103+
- uses: cachix/install-nix-action@2126ae7fc54c9df00dd18f7f18754393182c73cd # v31.9.1
104104

105105
- uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
106106
continue-on-error: true

.github/workflows/teams.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
maintainers/github-teams.json
3939
4040
- name: Install dependencies
41-
run: npm install bottleneck
41+
run: npm install bottleneck@2.19.5
4242

4343
- name: Synchronise teams
4444
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0

ci/eval/outpaths.nix

100644100755
File mode changed.

0 commit comments

Comments
 (0)