Skip to content

Commit 9c85c39

Browse files
authored
Cherry-picks for rel-1.23.0 (#26059)
- **Major Refactoring of Azure DevOps Pipelines (#26008)** - **Convert QNN x64 pipeline to GH (#26047)** - **Upgrade com.diffplug.spotless to 7.2.1 in Java build (#26051)** - **Fix Mac Catalyst build options. (#25970)** - **Update Podfile.template: update macOS target version from 13.3 to 13.4 (#25699) **
1 parent ad1d35e commit 9c85c39

File tree

85 files changed

+2562
-1348
lines changed

Some content is hidden

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

85 files changed

+2562
-1348
lines changed

.github/actions/locate-vcvarsall-and-setup-env/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
steps:
1515

1616
- name: Setup VCPKG
17-
uses: microsoft/onnxruntime-github-actions/[email protected].8
17+
uses: microsoft/onnxruntime-github-actions/[email protected].9
1818
with:
1919
vcpkg-version: '2025.06.13'
2020
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
ndk-version: 28.0.13004108
3838

3939
- name: Get Docker Image using Action
40-
uses: microsoft/onnxruntime-github-actions/[email protected].8
40+
uses: microsoft/onnxruntime-github-actions/[email protected].9
4141
id: build_docker_image_step
4242
with:
4343
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -122,7 +122,7 @@ jobs:
122122
architecture: x64
123123

124124

125-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
125+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
126126
with:
127127
vcpkg-version: '2025.06.13'
128128
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'

.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v5
2424
with:
2525
submodules: false
26-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
26+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
2727
with:
2828
vcpkg-version: '2025.06.13'
2929
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc

.github/workflows/linux-wasm-ci-build-and-test-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
python-version: "3.12"
5757
architecture: ${{ env.buildArch }}
5858

59-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
59+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
6060
with:
6161
vcpkg-version: '2025.06.13'
6262
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'

.github/workflows/linux_cuda_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Checkout code
5151
uses: actions/checkout@v5
5252

53-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
53+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
5454
id: build_docker_image_step
5555
with:
5656
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
@@ -93,7 +93,7 @@ jobs:
9393
# So build.py --build_dir build/Release inside the container correctly finds the artifacts.
9494
- name: Test ONNX Runtime
9595
id: test_step
96-
uses: microsoft/onnxruntime-github-actions/[email protected].8
96+
uses: microsoft/onnxruntime-github-actions/[email protected].9
9797
with:
9898
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
9999
build_config: Release

.github/workflows/linux_minimal_build.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
node-version: 20
3939

40-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
40+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
4141
with:
4242
vcpkg-version: '2025.06.13'
4343
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
@@ -47,7 +47,7 @@ jobs:
4747
disable-terrapin: 'true'
4848

4949
- name: Build Full ORT and Prepare Test Files
50-
uses: microsoft/onnxruntime-github-actions/[email protected].8
50+
uses: microsoft/onnxruntime-github-actions/[email protected].9
5151

5252
- name: Upload Test Data Artifact
5353
uses: actions/upload-artifact@v4
@@ -74,7 +74,7 @@ jobs:
7474
node-version: 20
7575

7676
- name: Get Docker Image using Action
77-
uses: microsoft/onnxruntime-github-actions/[email protected].8
77+
uses: microsoft/onnxruntime-github-actions/[email protected].9
7878
id: build_docker_image_step
7979
with:
8080
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -85,7 +85,7 @@ jobs:
8585
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8686

8787
- name: Run Build 2 (Update)
88-
uses: microsoft/onnxruntime-github-actions/[email protected].8
88+
uses: microsoft/onnxruntime-github-actions/[email protected].9
8989
with:
9090
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
9191
}}
@@ -100,7 +100,7 @@ jobs:
100100
--enable_training_ops
101101
102102
- name: Run Build 2 (Build)
103-
uses: microsoft/onnxruntime-github-actions/[email protected].8
103+
uses: microsoft/onnxruntime-github-actions/[email protected].9
104104
with:
105105
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
106106
}}
@@ -131,8 +131,8 @@ jobs:
131131
- uses: actions/setup-node@v4
132132
with:
133133
node-version: 20
134-
135-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
134+
135+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
136136
with:
137137
vcpkg-version: '2025.06.13'
138138
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
@@ -142,7 +142,7 @@ jobs:
142142
disable-terrapin: 'true'
143143

144144
- name: Build Full ORT and Prepare Test Files
145-
uses: microsoft/onnxruntime-github-actions/[email protected].8
145+
uses: microsoft/onnxruntime-github-actions/[email protected].9
146146
with:
147147
reduced-ops-config-file: required_ops.ort_models.config
148148
enable-custom-ops: 'true'
@@ -166,7 +166,7 @@ jobs:
166166
with:
167167
node-version: 20
168168

169-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
169+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
170170
with:
171171
vcpkg-version: '2025.06.13'
172172
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
@@ -175,7 +175,7 @@ jobs:
175175
add-cmake-to-path: 'true'
176176
disable-terrapin: 'true'
177177
- name: Build Full ORT and Prepare Test Files
178-
uses: microsoft/onnxruntime-github-actions/[email protected].8
178+
uses: microsoft/onnxruntime-github-actions/[email protected].9
179179
with:
180180
reduced-ops-config-file: required_ops_and_types.ort_models.config
181181
enable-type-reduction: 'true'
@@ -198,7 +198,7 @@ jobs:
198198
with:
199199
node-version: 20
200200

201-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
201+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
202202
with:
203203
vcpkg-version: '2025.06.13'
204204
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
@@ -208,7 +208,7 @@ jobs:
208208
disable-terrapin: 'true'
209209

210210
- name: Build Full ORT and Prepare Test Files
211-
uses: microsoft/onnxruntime-github-actions/[email protected].8
211+
uses: microsoft/onnxruntime-github-actions/[email protected].9
212212
with:
213213
globally_allowed_types: 'bool,float,int8_t,uint8_t'
214214
enable-type-reduction: 'true'
@@ -233,7 +233,7 @@ jobs:
233233
node-version: 20
234234

235235
- name: Get Docker Image using Action
236-
uses: microsoft/onnxruntime-github-actions/[email protected].8
236+
uses: microsoft/onnxruntime-github-actions/[email protected].9
237237
id: build_docker_image_step
238238
with:
239239
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -245,7 +245,7 @@ jobs:
245245

246246

247247
- name: Run Build 5 (Update)
248-
uses: microsoft/onnxruntime-github-actions/[email protected].8
248+
uses: microsoft/onnxruntime-github-actions/[email protected].9
249249
with:
250250
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
251251
}}
@@ -258,7 +258,7 @@ jobs:
258258
--minimal_build extended
259259
260260
- name: Run Build 5 (Build)
261-
uses: microsoft/onnxruntime-github-actions/[email protected].8
261+
uses: microsoft/onnxruntime-github-actions/[email protected].9
262262
with:
263263
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
264264
}}
@@ -270,7 +270,7 @@ jobs:
270270
--use_binskim_compliant_compile_flags
271271
--minimal_build extended
272272
- name: Run Build 5 (Test)
273-
uses: microsoft/onnxruntime-github-actions/[email protected].8
273+
uses: microsoft/onnxruntime-github-actions/[email protected].9
274274
with:
275275
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
276276
}}
@@ -297,7 +297,7 @@ jobs:
297297
submodules: false
298298

299299
- name: Get Docker Image using Action
300-
uses: microsoft/onnxruntime-github-actions/[email protected].8
300+
uses: microsoft/onnxruntime-github-actions/[email protected].9
301301
id: build_docker_image_step
302302
with:
303303
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -314,7 +314,7 @@ jobs:
314314
touch ${{ runner.temp }}/.test_data/include_no_operators.config
315315
316316
- name: Run Build 6a (Update)
317-
uses: microsoft/onnxruntime-github-actions/[email protected].8
317+
uses: microsoft/onnxruntime-github-actions/[email protected].9
318318
with:
319319
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
320320
}}
@@ -330,7 +330,7 @@ jobs:
330330
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
331331
332332
- name: Run Build 6a (Build)
333-
uses: microsoft/onnxruntime-github-actions/[email protected].8
333+
uses: microsoft/onnxruntime-github-actions/[email protected].9
334334
with:
335335
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
336336
}}
@@ -347,7 +347,7 @@ jobs:
347347
348348
349349
- name: Run Build 6a (Test)
350-
uses: microsoft/onnxruntime-github-actions/[email protected].8
350+
uses: microsoft/onnxruntime-github-actions/[email protected].9
351351
with:
352352
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
353353
}}
@@ -383,7 +383,7 @@ jobs:
383383
touch ${{ runner.temp }}/.test_data/include_no_operators.config
384384
385385
- name: Get Docker Image using Action
386-
uses: microsoft/onnxruntime-github-actions/[email protected].8
386+
uses: microsoft/onnxruntime-github-actions/[email protected].9
387387
id: build_docker_image_step
388388
with:
389389
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -394,7 +394,7 @@ jobs:
394394
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
395395

396396
- name: Run Build 6b (Update)
397-
uses: microsoft/onnxruntime-github-actions/[email protected].8
397+
uses: microsoft/onnxruntime-github-actions/[email protected].9
398398
with:
399399
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
400400
}}
@@ -413,7 +413,7 @@ jobs:
413413
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
414414
415415
- name: Run Build 6b (Build)
416-
uses: microsoft/onnxruntime-github-actions/[email protected].8
416+
uses: microsoft/onnxruntime-github-actions/[email protected].9
417417
with:
418418
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
419419
}}
@@ -452,7 +452,7 @@ jobs:
452452
touch ${{ runner.temp }}/.test_data/include_no_operators.config
453453
454454
- name: Get Docker Image using Action
455-
uses: microsoft/onnxruntime-github-actions/[email protected].8
455+
uses: microsoft/onnxruntime-github-actions/[email protected].9
456456
id: build_docker_image_step
457457
with:
458458
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -469,7 +469,7 @@ jobs:
469469
touch ${{ runner.temp }}/.test_data/include_no_operators.config
470470
471471
- name: Run Build 6c (Update)
472-
uses: microsoft/onnxruntime-github-actions/[email protected].8
472+
uses: microsoft/onnxruntime-github-actions/[email protected].9
473473
with:
474474
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
475475
}}
@@ -488,7 +488,7 @@ jobs:
488488
--cmake_extra_defines onnxruntime_BUILD_UNIT_TESTS=OFF
489489
490490
- name: Run Build 6c (Build)
491-
uses: microsoft/onnxruntime-github-actions/[email protected].8
491+
uses: microsoft/onnxruntime-github-actions/[email protected].9
492492
with:
493493
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name
494494
}}
@@ -531,7 +531,7 @@ jobs:
531531
path: ${{ runner.temp }}/.test_data/
532532

533533
- name: Get Docker Image using Action
534-
uses: microsoft/onnxruntime-github-actions/[email protected].8
534+
uses: microsoft/onnxruntime-github-actions/[email protected].9
535535
id: build_docker_image_step
536536
with:
537537
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile

.github/workflows/linux_tensorrt_ci.yml

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

5353
# --- Build the Docker image needed for testing ---
5454
- name: Build Docker Image for Testing
55-
uses: microsoft/onnxruntime-github-actions/[email protected].8
55+
uses: microsoft/onnxruntime-github-actions/[email protected].9
5656
id: build_docker_image_step
5757
with:
5858
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
@@ -95,7 +95,7 @@ jobs:
9595
# So build.py --build_dir build/Release inside the container correctly finds the artifacts.
9696
- name: Test ONNX Runtime
9797
id: test_step
98-
uses: microsoft/onnxruntime-github-actions/[email protected].8
98+
uses: microsoft/onnxruntime-github-actions/[email protected].9
9999
with:
100100
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
101101
build_config: Release

.github/workflows/linux_webgpu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
# - name: Checkout code
5252
# uses: actions/checkout@v4
5353

54-
# - uses: microsoft/onnxruntime-github-actions/[email protected].8
54+
# - uses: microsoft/onnxruntime-github-actions/[email protected].9
5555
# id: build_docker_image_step
5656
# with:
5757
# dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_webgpu
@@ -91,7 +91,7 @@ jobs:
9191

9292
# - name: Test ONNX Runtime
9393
# id: test_step
94-
# uses: microsoft/onnxruntime-github-actions/[email protected].8
94+
# uses: microsoft/onnxruntime-github-actions/[email protected].9
9595
# with:
9696
# docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
9797
# build_config: Release

.github/workflows/mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- name: Checkout code
6767
uses: actions/checkout@v5
68-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
68+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
6969
with:
7070
vcpkg-version: '2025.06.13'
7171
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
@@ -113,7 +113,7 @@ jobs:
113113
steps:
114114
- name: Checkout code
115115
uses: actions/checkout@v5
116-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
116+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
117117
with:
118118
vcpkg-version: '2025.06.13'
119119
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc

.github/workflows/macos-ci-build-and-test-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
steps:
6363
- name: Checkout code
6464
uses: actions/checkout@v5
65-
- uses: microsoft/onnxruntime-github-actions/[email protected].8
65+
- uses: microsoft/onnxruntime-github-actions/[email protected].9
6666
with:
6767
vcpkg-version: '2025.06.13'
6868
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc

0 commit comments

Comments
 (0)