| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -164,10 +164,12 @@ jobs: | |||
| 164 | 164 | - false | |
| 165 | 165 | - true | |
| 166 | 166 | include: | |
| 167 | - - os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64 | ||
| 167 | + # Forks don't have access to Windows on Arm runners. These jobs are skipped below: | ||
| 168 | + - os: ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }} | ||
| 168 | 169 | arch: arm64 | |
| 169 | 170 | free-threading: false | |
| 170 | - - os: windows-latest # FIXME(diegorusso): change to os: windows-aarch64 | ||
| 171 | + # Forks don't have access to Windows on Arm runners. These jobs are skipped below: | ||
| 172 | + - os: ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }} | ||
| 171 | 173 | arch: arm64 | |
| 172 | 174 | free-threading: true | |
| 173 | 175 | - os: windows-latest | |
@@ -187,12 +189,18 @@ jobs: | |||
| 187 | 189 | strategy: | |
| 188 | 190 | fail-fast: false | |
| 189 | 191 | matrix: | |
| 192 | + os: | ||
| 193 | + - windows-latest | ||
| 190 | 194 | arch: | |
| 191 | 195 | - x86 | |
| 192 | 196 | - x64 | |
| 193 | - - arm64 | ||
| 197 | + include: | ||
| 198 | + # Forks don't have access to Windows on Arm runners. These jobs are skipped below: | ||
| 199 | + - os: ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }} | ||
| 200 | + arch: arm64 | ||
| 194 | 201 | uses: ./.github/workflows/reusable-windows-msi.yml | |
| 195 | 202 | with: | |
| 203 | + os: ${{ matrix.os }} | ||
| 196 | 204 | arch: ${{ matrix.arch }} | |
| 197 | 205 | ||
| 198 | 206 | build-macos: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -74,7 +74,8 @@ jobs: | |||
| 74 | 74 | runner: windows-latest | |
| 75 | 75 | - target: aarch64-pc-windows-msvc/msvc | |
| 76 | 76 | architecture: ARM64 | |
| 77 | - runner: windows-latest | ||
| 77 | + # Forks don't have access to Windows on Arm runners. These jobs are skipped below: | ||
| 78 | + runner: ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }} | ||
| 78 | 79 | - target: x86_64-apple-darwin/clang | |
| 79 | 80 | architecture: x86_64 | |
| 80 | 81 | runner: macos-13 | |
@@ -95,25 +96,19 @@ jobs: | |||
| 95 | 96 | with: | |
| 96 | 97 | python-version: '3.11' | |
| 97 | 98 | ||
| 98 | - - name: Native Windows | ||
| 99 | - if: runner.os == 'Windows' && matrix.architecture != 'ARM64' | ||
| 99 | + - name: Windows | ||
| 100 | + # Forks don't have access to Windows on Arm runners. Skip those: | ||
| 101 | + if: runner.os == 'Windows' && (matrix.architecture != 'ARM64' || github.repository_owner == 'python') | ||
| 100 | 102 | run: | | |
| 101 | 103 | choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0 | |
| 102 | 104 | ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} | |
| 103 | 105 | ./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3 | |
| 104 | 106 | ||
| 105 | - # No tests (yet): | ||
| 106 | - - name: Emulated Windows | ||
| 107 | - if: runner.os == 'Windows' && matrix.architecture == 'ARM64' | ||
| 108 | - run: | | ||
| 109 | - choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0 | ||
| 110 | - ./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} | ||
| 111 | - | ||
| 112 | 107 | # The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966. | |
| 113 | 108 | # This is a bug in the macOS runner image where the pre-installed Python is installed in the same | |
| 114 | 109 | # directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes | |
| 115 | 110 | # the symlink to the pre-installed Python so that the Homebrew Python is used instead. | |
| 116 | - - name: Native macOS | ||
| 111 | + - name: macOS | ||
| 117 | 112 | if: runner.os == 'macOS' | |
| 118 | 113 | run: | | |
| 119 | 114 | brew update | |
@@ -124,7 +119,7 @@ jobs: | |||
| 124 | 119 | make all --jobs 4 | |
| 125 | 120 | ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 | |
| 126 | 121 | ||
| 127 | - - name: Native Linux | ||
| 122 | + - name: Linux | ||
| 128 | 123 | if: runner.os == 'Linux' | |
| 129 | 124 | run: | | |
| 130 | 125 | sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }} | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,6 +3,10 @@ name: Reusable Windows MSI | |||
| 3 | 3 | on: | |
| 4 | 4 | workflow_call: | |
| 5 | 5 | inputs: | |
| 6 | + os: | ||
| 7 | + description: OS to run on | ||
| 8 | + required: true | ||
| 9 | + type: string | ||
| 6 | 10 | arch: | |
| 7 | 11 | description: CPU architecture | |
| 8 | 12 | required: true | |
@@ -17,7 +21,7 @@ env: | |||
| 17 | 21 | jobs: | |
| 18 | 22 | build: | |
| 19 | 23 | name: installer for ${{ inputs.arch }} | |
| 20 | - runs-on: windows-latest | ||
| 24 | + runs-on: ${{ inputs.os }} | ||
| 21 | 25 | timeout-minutes: 60 | |
| 22 | 26 | env: | |
| 23 | 27 | ARCH: ${{ inputs.arch }} | |
@@ -27,5 +31,7 @@ jobs: | |||
| 27 | 31 | with: | |
| 28 | 32 | persist-credentials: false | |
| 29 | 33 | - name: Build CPython installer | |
| 34 | + # Forks don't have access to Windows on Arm runners. Skip those: | ||
| 35 | + if: inputs.arch != 'arm64' || github.repository_owner == 'python' | ||
| 30 | 36 | run: ./Tools/msi/build.bat --doc -"${ARCH}" | |
| 31 | 37 | shell: bash | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -24,7 +24,7 @@ env: | |||
| 24 | 24 | ||
| 25 | 25 | jobs: | |
| 26 | 26 | build: | |
| 27 | - name: ${{ inputs.arch == 'arm64' && 'build' || 'build and test' }} (${{ inputs.arch }}) | ||
| 27 | + name: Build and test (${{ inputs.arch }}) | ||
| 28 | 28 | runs-on: ${{ inputs.os }} | |
| 29 | 29 | timeout-minutes: 60 | |
| 30 | 30 | env: | |
@@ -37,17 +37,21 @@ jobs: | |||
| 37 | 37 | if: inputs.arch != 'Win32' | |
| 38 | 38 | run: echo "::add-matcher::.github/problem-matchers/msvc.json" | |
| 39 | 39 | - name: Build CPython | |
| 40 | + # Forks don't have access to Windows on Arm runners. Skip those: | ||
| 41 | + if: inputs.arch != 'arm64' || github.repository_owner == 'python' | ||
| 40 | 42 | run: >- | |
| 41 | 43 | .\\PCbuild\\build.bat | |
| 42 | 44 | -e -d -v | |
| 43 | 45 | -p "${ARCH}" | |
| 44 | 46 | ${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }} | |
| 45 | 47 | shell: bash | |
| 46 | - - name: Display build info # FIXME(diegorusso): remove the `if` | ||
| 47 | - if: inputs.arch != 'arm64' | ||
| 48 | + - name: Display build info | ||
| 49 | + # Forks don't have access to Windows on Arm runners. Skip those: | ||
| 50 | + if: inputs.arch != 'arm64' || github.repository_owner == 'python' | ||
| 48 | 51 | run: .\\python.bat -m test.pythoninfo | |
| 49 | - - name: Tests # FIXME(diegorusso): remove the `if` | ||
| 50 | - if: inputs.arch != 'arm64' | ||
| 52 | + - name: Tests | ||
| 53 | + # Forks don't have access to Windows on Arm runners. Skip those: | ||
| 54 | + if: inputs.arch != 'arm64' || github.repository_owner == 'python' | ||
| 51 | 55 | run: >- | |
| 52 | 56 | .\\PCbuild\\rt.bat | |
| 53 | 57 | -p "${ARCH}" | |
| Back | FazBrowse Home | New Git URL |
0 commit comments