Skip to content

Commit 936db4e

Browse files
authored
[compilers] Separate Windows/Mac python versions (#874)
Installing the latest Python 3.9 version proved to be an issue on some bot configuration. This reverts to installing 3.9.10 for Windows, which should solve the issue.
1 parent 3e453e9 commit 936db4e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -826,9 +826,9 @@ jobs:
826826
# This will grab the latest Python 3.9 version available for setup-python. It is necessary to
827827
# specify in this manner for Mac where actions/setup-python does not have version 3.9.10.
828828
# Once the Python version is upgraded to 3.12, these should be kept in sync.
829-
PYTHON_VERSION: 3.9
829+
PYTHON_VERSION_MACOS: 3.9
830830
# Must be a full version string from https://www.nuget.org/packages/pythonarm64
831-
PYTHON_VERSION_ARM64: 3.9.10
831+
PYTHON_VERSION_WINDOWS: 3.9.10
832832

833833
strategy:
834834
fail-fast: false
@@ -885,38 +885,38 @@ jobs:
885885
path: ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
886886
show-progress: false
887887

888-
- name: Install Python ${{ env.PYTHON_VERSION }} (Host)
888+
- name: Install Python ${{ env.PYTHON_VERSION_MACOS }} (Host)
889889
if: matrix.os == 'Darwin'
890890
uses: actions/setup-python@v5
891891
with:
892-
python-version: '${{ env.PYTHON_VERSION }}'
892+
python-version: '${{ env.PYTHON_VERSION_MACOS }}'
893893

894-
- name: Install Python ${{ env.PYTHON_VERSION }} (Host)
894+
- name: Install Python ${{ env.PYTHON_VERSION_WINDOWS }} (Host)
895895
if: matrix.os == 'Windows' && (matrix.arch == 'amd64' || inputs.build_arch == 'amd64')
896896
uses: actions/setup-python@v5
897897
id: python
898898
with:
899-
python-version: '${{ env.PYTHON_VERSION }}'
899+
python-version: '${{ env.PYTHON_VERSION_WINDOWS }}'
900900
architecture: x64
901901

902902
- uses: nuget/setup-nuget@v2
903903
if: inputs.build_os == 'Windows' && (matrix.arch == 'arm64' || inputs.build_arch == 'arm64')
904904

905905
# TODO(lxbndr) use actions/cache to improve this step timings
906-
- name: Install Python ${{ env.PYTHON_VERSION_ARM64 }} (Windows arm64)
906+
- name: Install Python ${{ env.PYTHON_VERSION_WINDOWS }} (Windows arm64)
907907
if: inputs.build_os == 'Windows' && (matrix.arch == 'arm64' || inputs.build_arch == 'arm64')
908908
run: |
909909
$NugetSources=[string](nuget Sources List -Format short)
910910
if (-Not ($NugetSources.contains("api.nuget.org"))) {
911911
nuget sources Add -Name api.nuget.org -Source https://api.nuget.org/v3/index.json -NonInteractive
912912
}
913-
nuget install pythonarm64 -Version ${{ env.PYTHON_VERSION_ARM64 }}
913+
nuget install pythonarm64 -Version ${{ env.PYTHON_VERSION_WINDOWS }}
914914
915915
- name: Export Python Location (Windows)
916916
if: inputs.build_os == 'Windows'
917917
run: |
918918
echo "PYTHON_LOCATION_amd64=$env:pythonLocation" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
919-
echo "PYTHON_LOCATION_arm64=${{ github.workspace }}\pythonarm64.${{ env.PYTHON_VERSION_ARM64 }}\tools" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
919+
echo "PYTHON_LOCATION_arm64=${{ github.workspace }}\pythonarm64.${{ env.PYTHON_VERSION_WINDOWS }}\tools" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
920920
921921
- uses: compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
922922
with:

0 commit comments

Comments
 (0)