8000 Merge pull request #205 from MaksimZhukov/v-mzhukov/migrate-python-ge… · akv-platform/python-versions@150cd39 · GitHub
[go: up one dir, main page]
Skip to content

Commit 150cd39

Browse files
marko-zivic-93marko-zivic-93
authored
Merge pull request actions#205 from MaksimZhukov/v-mzhukov/migrate-python-generation-to-macos-11
Switch Python generation from macOS 10.15 to 11
2 parents 188d4c2 + 93c6627 commit 150cd39

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

‎.github/workflows/python-builder.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
PLATFORMS:
1515
description: 'Platforms for execution in "os" or "os_arch" format (arch is "x64" by default)'
1616
required: true
17-
default: 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-10.15,windows-2019_x64,windows-2019_x86'
17+
default: 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86'
1818
pull_request:
1919
paths-ignore:
2020
- 'versions-manifest.json'
@@ -38,7 +38,7 @@ jobs:
3838
- name: Generate execution matrix
3939
id: generate-matrix
4040
run: |
41-
$configurations = "${{ github.event.inputs.platforms || 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-10.15,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
41+
[String[]]$configurations = "${{ github.event.inputs.platforms || 'ubuntu-18.04,ubuntu-20.04,ubuntu-22.04,macos-11,windows-2019_x64,windows-2019_x86' }}".Split(",").Trim()
4242
$matrix = @()
4343
4444
foreach ($configuration in $configurations) {
@@ -56,7 +56,7 @@ jobs:
5656
'arch' = $arch
5757
}
5858
}
59-
echo "matrix=$($matrix | ConvertTo-Json -Compress)" >> $env:GITHUB_OUTPUT
59+
echo "matrix=$($matrix | ConvertTo-Json -Compress -AsArray)" >> $env:GITHUB_OUTPUT
6060
6161
build_python:
6262
needs: generate_matrix

‎installers/macos-pkg-setup-template.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ echo "Create additional symlinks (Required for the UsePythonVersion Azure Pipeli
5454
ln -s ./bin/$PYTHON_MAJOR_DOT_MINOR python
5555

5656
cd bin/
57-
ln -s $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR
57+
58+
# This symlink already exists if Python version with the same major.minor version is installed,
59+
# since we do not remove the framework folder
60+
if [ ! -f $PYTHON_MAJOR_MINOR ]; then
61+
ln -s $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR
62+
fi
63+
5864
if [ ! -f python ]; then
5965
ln -s $PYTHON_MAJOR_DOT_MINOR python
6066
fi

0 commit comments

Comments
 (0)
0