@@ -826,9 +826,9 @@ jobs:
826
826
# This will grab the latest Python 3.9 version available for setup-python. It is necessary to
827
827
# specify in this manner for Mac where actions/setup-python does not have version 3.9.10.
828
828
# 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
830
830
# 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
832
832
833
833
strategy :
834
834
fail-fast : false
@@ -885,38 +885,38 @@ jobs:
885
885
path : ${{ github.workspace }}/SourceCache/swift-corelibs-libdispatch
886
886
show-progress : false
887
887
888
- - name : Install Python ${{ env.PYTHON_VERSION }} (Host)
888
+ - name : Install Python ${{ env.PYTHON_VERSION_MACOS }} (Host)
889
889
if : matrix.os == 'Darwin'
890
890
uses : actions/setup-python@v5
891
891
with :
892
- python-version : ' ${{ env.PYTHON_VERSION }}'
892
+ python-version : ' ${{ env.PYTHON_VERSION_MACOS }}'
893
893
894
- - name : Install Python ${{ env.PYTHON_VERSION }} (Host)
894
+ - name : Install Python ${{ env.PYTHON_VERSION_WINDOWS }} (Host)
895
895
if : matrix.os == 'Windows' && (matrix.arch == 'amd64' || inputs.build_arch == 'amd64')
896
896
uses : actions/setup-python@v5
897
897
id : python
898
898
with :
899
- python-version : ' ${{ env.PYTHON_VERSION }}'
899
+ python-version : ' ${{ env.PYTHON_VERSION_WINDOWS }}'
900
900
architecture : x64
901
901
902
902
- uses : nuget/setup-nuget@v2
903
903
if : inputs.build_os == 'Windows' && (matrix.arch == 'arm64' || inputs.build_arch == 'arm64')
904
904
905
905
# 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)
907
907
if : inputs.build_os == 'Windows' && (matrix.arch == 'arm64' || inputs.build_arch == 'arm64')
908
908
run : |
909
909
$NugetSources=[string](nuget Sources List -Format short)
910
910
if (-Not ($NugetSources.contains("api.nuget.org"))) {
911
911
nuget sources Add -Name api.nuget.org -Source https://api.nuget.org/v3/index.json -NonInteractive
912
912
}
913
- nuget install pythonarm64 -Version ${{ env.PYTHON_VERSION_ARM64 }}
913
+ nuget install pythonarm64 -Version ${{ env.PYTHON_VERSION_WINDOWS }}
914
914
915
915
- name : Export Python Location (Windows)
916
916
if : inputs.build_os == 'Windows'
917
917
run : |
918
918
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
920
920
921
921
- uses : compnerd/gha-setup-vsdevenv@f1ba60d553a3216ce1b89abe0201213536bc7557 # main
922
922
with :
0 commit comments