diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index f0672586..accbf59d 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -53,6 +53,10 @@ jobs: & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }} New-Item -Path "C:\gtk-build\python-3.14.2" -ItemType Directory -Force | Out-Null +<<<<<<< ours +======= + New-Item -Path "C:\gtk-build\python-3.14" -ItemType Directory -Force | Out-Null +>>>>>>> theirs $pyRoot = $env:pythonLocation if (-not $pyRoot) { @@ -62,7 +66,15 @@ jobs: $target = "C:\gtk-build\python-3.14.2\${{ matrix.platform }}" if (Test-Path $target) { Remove-Item $target -Recurse -Force } +<<<<<<< ours New-Item -Path "C:\gtk-build\python-3.14.2" -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null +======= + $aliasTarget = "C:\gtk-build\python-3.14\${{ matrix.platform }}" + if (Test-Path $aliasTarget) { Remove-Item $aliasTarget -Recurse -Force } + + New-Item -Path "C:\gtk-build\python-3.14.2" -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null + New-Item -Path "C:\gtk-build\python-3.14" -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null +>>>>>>> theirs python -m pip install --upgrade pip python -m pip install cffi