Skip to content

Commit 6a05dbc

Browse files
author
Alan Jowett
committed
Merge main
Signed-off-by: Alan Jowett <alan.jowett@microsoft.com>
2 parents af8e0e8 + f1003ce commit 6a05dbc

File tree

190 files changed

+7001
-20601
lines changed

Some content is hidden

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

190 files changed

+7001
-20601
lines changed

.azure/OneBranch.PullRequest.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ jobs:
8080
parameters:
8181
name: unit_tests
8282
pre_test: appverif -enable Exceptions Handles Heaps Leak Locks Memory SRWLock Threadpool TLS DangerousAPIs DirtyStacks TimeRollOver -for unit_tests.exe
83-
# Exclude [processes] test that ASAN can't work with.
84-
# Exclude ~printk, ~recursive_tail_call, and ~sequential_tail_call tests as they don't work with ASAN due to
85-
# as usersim is linked with static CRT libraries which breaks stdout redirection.
86-
test_command: '.\unit_tests.exe -d yes ~[processes] ~printk ~recursive_tail_call ~sequential_tail_call'
83+
test_command: '.\unit_tests.exe -d yes ~[processes]'
8784
dependency: regular
8885
build_artifact: Build
8986
environment: windows-2022
@@ -322,7 +319,9 @@ jobs:
322319
parameters:
323320
name: sanitize_unit_tests
324321
# Exclude [processes] test that ASAN can't work with.
325-
test_command: '.\unit_tests.exe -d yes ~[processes]'
322+
# Exclude ~printk, ~recursive_tail_call, and ~sequential_tail_call tests as they don't work with ASAN due as
323+
# usersim is linked with static CRT libraries which breaks stdout redirection.
324+
test_command: '.\unit_tests.exe -d yes ~[processes] ~printk ~recursive_tail_call ~sequential_tail_call'
326325
dependency: sanitize
327326
build_artifact: Build-Sanitize
328327
environment: windows-2022

.github/workflows/check-pr-fork.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ on:
99

1010
jobs:
1111
call-common:
12-
uses: ./.github/workflows/check_pr.yml
12+
uses: ./.github/workflows/check-pr.yml
1313
with:
1414
run_on_fork: true

.github/workflows/check-pr-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ on:
99

1010
jobs:
1111
call-common:
12-
uses: ./.github/workflows/check_pr.yml
12+
uses: ./.github/workflows/check-pr.yml
1313
with:
1414
run_on_fork: false

.github/workflows/cicd.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ jobs:
246246
if: github.repository == 'microsoft/ebpf-for-windows' && (github.event_name == 'schedule' || github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch')
247247
uses: ./.github/workflows/reusable-test.yml
248248
strategy:
249+
fail-fast: false
249250
matrix:
250251
image:
251252
- 'server2022'
@@ -291,7 +292,8 @@ jobs:
291292
# Always run this job.
292293
# Only run this on repos that have self-host runners.
293294
needs: regular
294-
if: github.repository == 'microsoft/ebpf-for-windows' && (github.event_name == 'schedule' || github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch')
295+
# Disabled for now for schedule, pull_request, merge_group, and push until in-progress breaking changes are completed.
296+
if: github.repository == 'microsoft/ebpf-for-windows' && (github.event_name == 'workflow_dispatch')
295297
uses: ./.github/workflows/reusable-test.yml
296298
with:
297299
pre_test: .\setup_ebpf_cicd_tests.ps1 -TestMode "Regression" -RegressionArtifactsVersion "0.21.0" -GranularTracing

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
- name: 'Checkout Repository'
2929
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
3030
- name: 'Dependency Review'
31-
uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
31+
uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0

.github/workflows/nuget_update.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
ref: ${{ github.event.workflow_run.head_branch }}
4545

4646
- name: Cache nuget packages
47-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
47+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
4848
env:
4949
cache-name: cache-nuget-modules
5050
with:

.github/workflows/ossar-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ jobs:
8181

8282
- name: Upload results to Security tab
8383
if: steps.skip_check.outputs.should_skip != 'true'
84-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3
84+
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885
8585
with:
8686
sarif_file: ${{ steps.ossar.outputs.sarifFile }}

.github/workflows/reusable-build.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
138138
- name: Initialize CodeQL
139139
if: inputs.build_codeql == true && steps.skip_check.outputs.should_skip != 'true'
140-
uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3
140+
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885
141141
with:
142142
languages: 'cpp'
143143

@@ -148,7 +148,7 @@ jobs:
148148

149149
- name: Cache chocolatey packages
150150
if: steps.skip_check.outputs.should_skip != 'true'
151-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
151+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
152152
env:
153153
cache-name: cache-choco-packages
154154
with:
@@ -187,7 +187,8 @@ jobs:
187187

188188
- name: Cache nuget packages
189189
if: steps.skip_check.outputs.should_skip != 'true'
190-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
190+
continue-on-error: true
191+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
191192
env:
192193
cache-name: cache-nuget-modules
193194
with:
@@ -197,7 +198,7 @@ jobs:
197198
- name: Cache verifier project
198199
# The hash is based on the HEAD of the ebpf-verifier submodule, the Directory.Build.props file, and the build variant.
199200
if: steps.skip_check.outputs.should_skip != 'true'
200-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
201+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
201202
env:
202203
cache-name: cache-verifier-project
203204
with:
@@ -355,4 +356,4 @@ jobs:
355356

356357
- name: Perform CodeQL Analysis
357358
if: inputs.build_codeql == true && steps.skip_check.outputs.should_skip != 'true'
358-
uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3
359+
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885

.github/workflows/reusable-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
# Add cache entry for any choco packages that are installed.
149149
# The cache key is based on the hash of this file so if any choco packages are added or removed, the cache will be invalidated.
150150
if: (inputs.gather_dumps == true) && (steps.skip_check.outputs.should_skip != 'true')
151-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809
151+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
152152
env:
153153
cache-name: cache-choco-packages
154154
with:

.github/workflows/scorecards-analysis.yml

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

5656
- name: "Run analysis"
5757
if: github.ref_name == 'main'
58-
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
58+
uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
5959
with:
6060
results_file: results.sarif
6161
results_format: sarif
@@ -80,6 +80,6 @@ jobs:
8080
# Upload the results to GitHub's code scanning dashboard.
8181
- name: "Upload to code-scanning"
8282
if: github.ref_name == 'main'
83-
uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3
83+
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885
8484
with:
8585
sarif_file: results.sarif

0 commit comments

Comments
 (0)