Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cherry-pick commits from main to rel-1.23.0 (#26050)
This PR cherry-picks several commits from the main branch to the
rel-1.23.0 release branch as part of the release process.

### Changes included:

*   **Major Refactoring of Azure DevOps Pipelines (#26008)**
    *   Commit: `2e6d7ccfdff55aaf7b0799d7e28b041e607dce2b`
*   **Disables failing test to unblock Python DML Pipeline (#26043)**
    *   Commit: `64c8f40d01bf14b3cf7ac4cf8606ad9e0e56feb0`
*   **Pin cmake version in macOS github Actions (#25998)**
    *   Commit: `148f13cc6b44cae156226cd4e0dcfc154691c5b4`
*   **Bump actions/setup-python from 5 to 6 (#25979)**
    *   Commit: `97a8d332595c974ad24be133df216565493ffb95`
*   **Remove CACHE_URL settings from Github Actions (#25989)**
    *   Commit: `e2a0999ba4b224ab90ef7a8768dd4941fcc19b17`
*   **Bump actions/checkout from 4 to 5 (#25771)**
    *   Commit: `f19215db21f8e1a8fc93090748e455f41076f456`
*   **Bump ruff from 0.12.8 to 0.12.9 (#25772)**
    *   Commit: `78df404871fa2f3fbbb7f1902f9623787ba8dc86`
*   **Bump ruff from 0.12.4 to 0.12.8 (#25713)**
    *   Commit: `7204746e709005d2c7294e7a24d63a2df4a1aee8`
*   **Update macOS target version from 13.3 to 13.4 (#25616)**
    *   Commit: `65bd82564cd31e0acf9139cdd826d08193212c6e`

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Prathik Rao <[email protected]>
  • Loading branch information
3 people authored Sep 16, 2025
commit ad1d35e662bd1d231af541c35dd9fb0b97986cf8
2 changes: 1 addition & 1 deletion .github/actions/locate-vcvarsall-and-setup-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
steps:

- name: Setup VCPKG
uses: microsoft/onnxruntime-github-actions/[email protected].7
uses: microsoft/onnxruntime-github-actions/[email protected].8
with:
vcpkg-version: '2025.06.13'
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
Expand Down
10 changes: 1 addition & 9 deletions .github/actions/macos-ci-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,7 @@ runs:
run: |
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ inputs.xcode_version }}.app/Contents/Developer"
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"

- name: Export GitHub Actions cache environment variables
if: ${{ inputs.use_cache }}
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');


- name: Install python dependencies
shell: bash
working-directory: ${{ github.workspace }}
Expand Down
35 changes: 6 additions & 29 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: false

Expand All @@ -37,7 +37,7 @@ jobs:
ndk-version: 28.0.13004108

- name: Get Docker Image using Action
uses: microsoft/onnxruntime-github-actions/[email protected].7
uses: microsoft/onnxruntime-github-actions/[email protected].8
id: build_docker_image_step
with:
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/inference/x86_64/default/cpu/Dockerfile
Expand Down Expand Up @@ -66,14 +66,7 @@ jobs:
set_var("BuildConfigOs", config["os"])
shell: python
working-directory: ${{ github.workspace }}

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');


- name: 1a. Build onnxruntime
run: |
set -e -x
Expand Down Expand Up @@ -107,8 +100,6 @@ jobs:
-e BUILD_ID=${{ github.run_id }} \
-e BUILD_REASON=${{ github.event_name }} \
-e BUILD_BRANCH=${{ github.ref }} \
-e ACTIONS_CACHE_URL \
-e ACTIONS_RUNTIME_TOKEN \
-e RUNNER_TEMP=/build \
${{ steps.build_docker_image_step.outputs.full-image-name }} \
bash -c "python3 -m pip install -r /onnxruntime_src/tools/ci_build/requirements/pybind/requirements.txt && \
Expand All @@ -121,7 +112,7 @@ jobs:
android_nnapi_ep:
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Use jdk 17
uses: actions/setup-java@v4
Expand All @@ -131,7 +122,7 @@ jobs:
architecture: x64


- uses: microsoft/onnxruntime-github-actions/[email protected].7
- uses: microsoft/onnxruntime-github-actions/[email protected].8
with:
vcpkg-version: '2025.06.13'
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
Expand All @@ -145,13 +136,6 @@ jobs:
with:
ndk-version: 28.0.13004108

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: NNAPI EP, Build, Test on Android Emulator
run: >-
python3 tools/ci_build/build.py
Expand Down Expand Up @@ -203,7 +187,7 @@ jobs:
name: Android CI Pipeline
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Use jdk 17
uses: actions/setup-java@v4
Expand All @@ -217,13 +201,6 @@ jobs:
with:
ndk-version: 28.0.13004108

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: CPU EP, Build and Test
run: >-
python3 tools/ci_build/build.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cffconvert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- name: Check out a copy of the repository
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Check whether the citation metadata from CITATION.cff is valid
uses: citation-file-format/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: "Validation"
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: gradle/actions/wrapper-validation@v4
concurrency:
group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.ref || github.sha }}
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,24 @@ jobs:
runs-on: macos-14
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: false
- uses: microsoft/onnxruntime-github-actions/[email protected]
with:
vcpkg-version: '2025.06.13'
vcpkg-hash: 735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc
cmake-version: '3.31.8'
cmake-hash: 99cc9c63ae49f21253efb5921de2ba84ce136018abf08632c92c060ba91d552e0f6acc214e9ba8123dee0cf6d1cf089ca389e321879fd9d719a60d975bcffcc8
add-cmake-to-path: 'true'
disable-terrapin: 'true'
- name: Use Xcode ${{ env.XCODE_VERSION }}
shell: bash
run: |
set -e -x
XCODE_DEVELOPER_DIR="/Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer"
sudo xcode-select --switch "${XCODE_DEVELOPER_DIR}"

- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: (CPU, CoreML, XNNPACK EPs) Build onnxruntime for iOS x86_64 and run tests using simulator
shell: bash
run: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Optional Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: misspell # Check spellings as well
uses: reviewdog/action-misspell@v1
with:
Expand All @@ -42,9 +42,9 @@ jobs:
contents: read
security-events: write
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- name: Setup Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
# Use the version configured in target-version of [tool.black] section in pyproject.toml.
python-version: "3.10"
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
name: Lint JavaScript
runs-on: ["self-hosted", "1ES.Pool=onnxruntime-github-Ubuntu2204-AMD-CPU"]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/linux-wasm-ci-build-and-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
submodules: recursive

Expand All @@ -51,25 +51,19 @@ jobs:
node-version: "22"

- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.12"
architecture: ${{ env.buildArch }}

- uses: microsoft/onnxruntime-github-actions/[email protected].7
- uses: microsoft/onnxruntime-github-actions/[email protected].8
with:
vcpkg-version: '2025.06.13'
vcpkg-hash: '735923258c5187966698f98ce0f1393b8adc6f84d44fd8829dda7db52828639331764ecf41f50c8e881e497b569f463dbd02dcb027ee9d9ede0711102de256cc'
cmake-version: '3.31.6'
cmake-hash: '42395e20b10a8e9ef3e33014f9a4eed08d46ab952e02d2c1bbc8f6133eca0d7719fb75680f9bbff6552f20fcd1b73d86860f7f39388d631f98fb6f622b37cf04'
add-cmake-to-path: 'true'
disable-terrapin: 'true'
- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Build (simd + threads)
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux_cuda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
packages: read
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- uses: microsoft/onnxruntime-github-actions/[email protected].7
- uses: microsoft/onnxruntime-github-actions/[email protected].8
id: build_docker_image_step
with:
dockerfile: ${{ github.workspace }}/tools/ci_build/github/linux/docker/Dockerfile.manylinux2_28_cuda
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
# So build.py --build_dir build/Release inside the container correctly finds the artifacts.
- name: Test ONNX Runtime
id: test_step
uses: microsoft/onnxruntime-github-actions/[email protected].7
uses: microsoft/onnxruntime-github-actions/[email protected].8
with:
docker_image: ${{ steps.build_docker_image_step.outputs.full-image-name }}
build_config: Release
Expand Down
Loading
Loading