Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/install-vs-components.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# See https://github.com/actions/runner-images/issues/9701
# Adapted from https://github.com/actions/runner-images/issues/9873#issuecomment-2139288682

# NOTE: This isn't currently needed, but script is kept in case Microsoft breaks GitHub-hosted runners for us again

import os
import platform
from itertools import chain
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
test:
name: Build and test
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: &timeout-minutes 25
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -72,9 +72,6 @@ jobs:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Install missing Visual Studio components
run: python .github\workflows\install-vs-components.py

- name: Build and register the PyCOMTest server dll
# Pass Silent flag to regsvr32 to avoid hanging on confirmation window
run: com/TestSources/PyCOMTest/buildAndRegister.bat /s
Expand All @@ -99,7 +96,7 @@ jobs:
cross_compile_arm64:
name: Cross-compile ARM64
runs-on: windows-2022
timeout-minutes: 30
timeout-minutes: *timeout-minutes
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -143,7 +140,7 @@ jobs:
# This job can be run locally by running `pre-commit run`
checkers:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: *timeout-minutes
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v7
Expand Down Expand Up @@ -177,7 +174,7 @@ jobs:

type-checkers:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: *timeout-minutes
strategy:
fail-fast: false
matrix:
Expand Down
Loading