Skip to content

Commit 5777df5

Browse files
committed
Add explicit step to setup python
1 parent 38e608e commit 5777df5

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

.github/actions/setup-python/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ runs:
1818
steps:
1919
- name: Install the latest version of uv
2020
uses: astral-sh/setup-uv@v5
21+
with:
22+
working-directory: ${{ inputs.repo-root }}
23+
# Explicitly set where the pyproject.toml file is located untill we
24+
# a fix for https://github.com/astral-sh/setup-uv/issues/441
25+
cache-dependency-glob: ${{ inputs.repo-root }}/**/pyproject.toml
26+
2127
# uv misbehaves in the presence of the python 3.9 pythonarm64 Nuget package.
2228
# This is a workaround to remove it if it exists.
2329
- name: Uninstall pythonarm64 if installed

.github/workflows/swift-toolchain.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,10 @@ jobs:
686686
ref: ${{ inputs.swift_revision }}
687687
path: ${{ github.workspace }}/SourceCache/swift
688688
show-progress: false
689-
689+
- name: Setup python
690+
uses: ./SourceCache/ci-build/.github/actions/setup-python
691+
with:
692+
repo-root: ${{ github.workspace }}/SourceCache/ci-build
690693
- name: Configure Tools
691694
run: |
692695
cmake -B ${{ github.workspace }}/BinaryCache/0 `
@@ -1174,7 +1177,11 @@ jobs:
11741177
Copy-Item -Path "${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/*.dylib" -Destination "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/${{ inputs.swift_version }}+Asserts/usr/lib/swift/host/compiler"
11751178
}
11761179
1177-
- uses: actions/setup-python@v5
1180+
- name: Setup python
1181+
uses: ./SourceCache/ci-build/.github/actions/setup-python
1182+
with:
1183+
repo-root: ${{ github.workspace }}/SourceCache/ci-build
1184+
11781185
- uses: jannekem/run-python-script-action@v1
11791186
with:
11801187
script: |
@@ -1688,6 +1695,11 @@ jobs:
16881695
ndk-version: ${{ inputs.ANDROID_NDK_VERSION }}
16891696
local-cache: true
16901697

1698+
- name: Setup python
1699+
uses: ./SourceCache/ci-build/.github/actions/setup-python
1700+
with:
1701+
repo-root: ${{ github.workspace }}/SourceCache/ci-build
1702+
16911703
- name: Configure LLVM
16921704
if: matrix.os != 'Android' || inputs.build_android
16931705
run: |
@@ -2565,7 +2577,11 @@ jobs:
25652577
run: |
25662578
cmake --build ${{ github.workspace }}/BinaryCache/libdispatch --target install
25672579
2568-
- uses: actions/setup-python@v5
2580+
- name: Setup python
2581+
uses: ./SourceCache/ci-build/.github/actions/setup-python
2582+
with:
2583+
repo-root: ${{ github.workspace }}/SourceCache/ci-build
2584+
25692585
- uses: jannekem/run-python-script-action@v1
25702586
if: matrix.os != 'Android' || inputs.build_android
25712587
with:

0 commit comments

Comments
 (0)