Skip to content

Commit 3215fef

Browse files
jatinwadhwa921jatinwadhwa921
authored
Merge pull request #810 from intel/sync_msft_10_9_25
Backmerging with Msft commits
2 parents edc51ea + fba645c commit 3215fef

File tree

318 files changed

+15374
-4536
lines changed

Some content is hidden

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

318 files changed

+15374
-4536
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].7
17+
uses: microsoft/onnxruntime-github-actions/[email protected].8
1818
with:
1919
vcpkg-version: '2025.06.13'
2020
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'

‎.github/actions/macos-ci-setup/action.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,7 @@ runs:
6161
run: |
6262
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ inputs.xcode_version }}.app/Contents/Developer"
6363
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
64-
65-
- name: Export GitHub Actions cache environment variables
66-
if: ${{ inputs.use_cache }}
67-
uses: actions/github-script@v7
68-
with:
69-
script: |
70-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
71-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
72-
64+
7365
- name: Install python dependencies
7466
shell: bash
7567
working-directory: ${{ github.workspace }}

‎.github/workflows/android.yml

Lines changed: 5 additions & 28 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].7
40+
uses: microsoft/onnxruntime-github-actions/[email protected].8
4141
id: build_docker_image_step
4242
with:
4343
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
@@ -66,20 +66,13 @@ jobs:
6666
set_var("BuildConfigOs", config["os"])
6767
shell: python
6868
working-directory: ${{ github.workspace }}
69-
70-
- name: Export GitHub Actions cache environment variables
71-
uses: actions/github-script@v7
72-
with:
73-
script: |
74-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
75-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
76-
69+
7770
- name: 1a. Build onnxruntime
7871
run: |
7972
set -e -x
8073
BINARY_SIZE_THRESHOLD_ARGS=""
81-
echo "Binary size threshold in bytes: 1306224"
82-
BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1306224"
74+
echo "Binary size threshold in bytes: 1436672"
75+
BINARY_SIZE_THRESHOLD_ARGS="--threshold_size_in_bytes 1436672"
8376
8477
# Ensure ANDROID_NDK_HOME is available and get its real path
8578
if [ -z "$ANDROID_NDK_HOME" ]; then
@@ -107,8 +100,6 @@ jobs:
107100
-e BUILD_ID=${{ github.run_id }} \
108101
-e BUILD_REASON=${{ github.event_name }} \
109102
-e BUILD_BRANCH=${{ github.ref }} \
110-
-e ACTIONS_CACHE_URL \
111-
-e ACTIONS_RUNTIME_TOKEN \
112103
-e RUNNER_TEMP=/build \
113104
${{ steps.build_docker_image_step.outputs.full-image-name }} \
114105
bash -c "python3 -m pip install -r /onnxruntime_src/tools/ci_build/requirements/pybind/requirements.txt && \
@@ -131,7 +122,7 @@ jobs:
131122
architecture: x64
132123

133124

134-
- uses: microsoft/onnxruntime-github-actions/[email protected].7
125+
- uses: microsoft/onnxruntime-github-actions/[email protected].8
135126
with:
136127
vcpkg-version: '2025.06.13'
137128
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
@@ -145,13 +136,6 @@ jobs:
145136
with:
146137
ndk-version: 28.0.13004108
147138

148-
- name: Export GitHub Actions cache environment variables
149-
uses: actions/github-script@v7
150-
with:
151-
script: |
152-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
153-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
154-
155139
- name: NNAPI EP, Build, Test on Android Emulator
156140
run: >-
157141
python3 tools/ci_build/build.py
@@ -217,13 +201,6 @@ jobs:
217201
with:
218202
ndk-version: 28.0.13004108
219203

220-
- name: Export GitHub Actions cache environment variables
221-
uses: actions/github-script@v7
222-
with:
223-
script: |
224-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
225-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
226-
227204
- name: CPU EP, Build and Test
228205
run: >-
229206
python3 tools/ci_build/build.py

‎.github/workflows/ios.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,21 @@ jobs:
2323
uses: actions/checkout@v5
2424
with:
2525
submodules: false
26+
- uses: microsoft/onnxruntime-github-actions/[email protected]
27+
with:
28+
vcpkg-version: '2025.06.13'
29+
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
30+
cmake-version: '3.31.8'
31+
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
32+
add-cmake-to-path: 'true'
33+
disable-terrapin: 'true'
2634
- name: Use Xcode ${{ env.XCODE_VERSION }}
2735
shell: bash
2836
run: |
2937
set -e -x
3038
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer"
3139
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"
3240
33-
- name: Export GitHub Actions cache environment variables
34-
uses: actions/github-script@v7
35-
with:
36-
script: |
37-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
38-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
39-
4041
- name: (CPU, CoreML, XNNPACK EPs) Build onnxruntime for iOS x86_64 and run tests using simulator
4142
shell: bash
4243
run: |

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
- uses: actions/checkout@v5
4646
- name: Setup Python
47-
uses: actions/setup-python@v5
47+
uses: actions/setup-python@v6
4848
with:
4949
# Use the version configured in target-version of [tool.black] section in pyproject.toml.
5050
python-version: "3.10"

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,19 @@ jobs:
5151
node-version: "22"
5252

5353
- name: Set up Python
54-
uses: actions/setup-python@v5
54+
uses: actions/setup-python@v6
5555
with:
5656
python-version: "3.12"
5757
architecture: ${{ env.buildArch }}
5858

59-
- uses: microsoft/onnxruntime-github-actions/[email protected].7
59+
- uses: microsoft/onnxruntime-github-actions/[email protected].8
6060
with:
6161
vcpkg-version: '2025.06.13'
6262
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
6363
cmake-version: '3.31.6'
6464
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
6565
add-cmake-to-path: 'true'
6666
disable-terrapin: 'true'
67-
- name: Export GitHub Actions cache environment variables
68-
uses: actions/github-script@v7
69-
with:
70-
script: |
71-
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
72-
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
7367

7468
- name: Build (simd + threads)
7569
run: |

‎.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].7
53+
- uses: microsoft/onnxruntime-github-actions/[email protected].8
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].7
96+
uses: microsoft/onnxruntime-github-actions/[email protected].8
9797
with:
9898
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
9999
build_config: Release

0 commit comments

Comments
 (0)