Skip to content

Commit 7fdae57

Browse files
cqc-aleccqc-alec
authored
Use windows-2022 runner instead of windows-2025 (#2163)
1 parent 16f984f commit 7fdae57

7 files changed

Lines changed: 295 additions & 333 deletions

File tree

‎.github/workflows/build_and_test.yml‎

Lines changed: 207 additions & 243 deletions
Large diffs are not rendered by default.

‎.github/workflows/build_libs.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,14 @@ jobs:
4646
if: ${{ needs.changes.outputs.libs != '[]' && needs.changes.outputs.libs != '' }}
4747
strategy:
4848
matrix:
49-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
50-
# os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2025']
51-
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26']
49+
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2022']
5250
lib: ${{ fromJson(needs.changes.outputs.libs) }}
5351
build_type: ['Release', 'Debug']
5452
runs-on: ${{ matrix.os }}
5553
steps:
5654
- uses: actions/checkout@v6
5755
- name: normalize line endings in conanfile and src directory
58-
if: matrix.os == 'windows-2025'
56+
if: matrix.os == 'windows-2022'
5957
# This is necessary to ensure consistent revisions across platforms.
6058
# Conan's revision hash is composed of hashes all the exported files, so
6159
# we must normalize the line endings in these.

‎.github/workflows/release.yml‎

Lines changed: 75 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -143,45 +143,44 @@ jobs:
143143
name: MacOS_arm64_${{ matrix.python-version }}_wheel
144144
path: wheelhouse/
145145

146-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
147-
# build_Windows_wheels:
148-
# name: Build Windows wheels
149-
# runs-on: windows-2025
150-
# strategy:
151-
# matrix:
152-
# python-version: ['3.10', '3.11', '3.12']
153-
# steps:
154-
# - uses: actions/checkout@v6
155-
# with:
156-
# fetch-depth: '0'
157-
# - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
158-
# - name: Select Python ${{ matrix.python-version }}
159-
# uses: actions/setup-python@v6
160-
# with:
161-
# python-version: ${{ matrix.python-version }}
162-
# - name: Install conan
163-
# uses: turtlebrowser/get-conan@v1.2
164-
# - name: Set up conan
165-
# shell: bash
166-
# run: |
167-
# conan profile detect
168-
# DEFAULT_PROFILE_PATH=`conan profile path default`
169-
# PROFILE_PATH=./conan-profiles/windows-2025
170-
# diff ${DEFAULT_PROFILE_PATH} ${PROFILE_PATH} || true
171-
# cp ${PROFILE_PATH} ${DEFAULT_PROFILE_PATH}
172-
# conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
173-
# - name: Build tket
174-
# run: conan create tket --user tket --channel stable --build=missing -o boost/*:header_only=True -o tklog/*:shared=True -o tket/*:shared=True -tf ""
175-
# - name: Build wheel
176-
# shell: bash
177-
# run: |
178-
# cd pytket
179-
# python -m pip install -U pip build
180-
# TKET_VERSION=`cat ../TKET_VERSION` python -m build --outdir "${{ github.workspace }}/wheelhouse"
181-
# - uses: actions/upload-artifact@v7
182-
# with:
183-
# name: Windows_${{ matrix.python-version }}_wheel
184-
# path: wheelhouse/
146+
build_Windows_wheels:
147+
name: Build Windows wheels
148+
runs-on: windows-2022
149+
strategy:
150+
matrix:
151+
python-version: ['3.10', '3.11', '3.12']
152+
steps:
153+
- uses: actions/checkout@v6
154+
with:
155+
fetch-depth: '0'
156+
- run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
157+
- name: Select Python ${{ matrix.python-version }}
158+
uses: actions/setup-python@v6
159+
with:
160+
python-version: ${{ matrix.python-version }}
161+
- name: Install conan
162+
uses: turtlebrowser/get-conan@v1.2
163+
- name: Set up conan
164+
shell: bash
165+
run: |
166+
conan profile detect
167+
DEFAULT_PROFILE_PATH=`conan profile path default`
168+
PROFILE_PATH=./conan-profiles/windows-2022
169+
diff ${DEFAULT_PROFILE_PATH} ${PROFILE_PATH} || true
170+
cp ${PROFILE_PATH} ${DEFAULT_PROFILE_PATH}
171+
conan remote add tket-libs https://quantinuumsw.jfrog.io/artifactory/api/conan/tket1-libs --index 0
172+
- name: Build tket
173+
run: conan create tket --user tket --channel stable --build=missing -o boost/*:header_only=True -o tklog/*:shared=True -o tket/*:shared=True -tf ""
174+
- name: Build wheel
175+
shell: bash
176+
run: |
177+
cd pytket
178+
python -m pip install -U pip build
179+
TKET_VERSION=`cat ../TKET_VERSION` python -m build --outdir "${{ github.workspace }}/wheelhouse"
180+
- uses: actions/upload-artifact@v7
181+
with:
182+
name: Windows_${{ matrix.python-version }}_wheel
183+
path: wheelhouse/
185184

186185
test_linux_wheels:
187186
name: Test linux wheels
@@ -332,50 +331,47 @@ jobs:
332331
python${{ matrix.python-version }} -m pip install -r requirements.txt
333332
python${{ matrix.python-version }} -m pytest --ignore=simulator/
334333
335-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
336-
# test_Windows_wheels:
337-
# name: Test Windows wheels
338-
# needs: build_Windows_wheels
339-
# runs-on: windows-2025
340-
# strategy:
341-
# matrix:
342-
# python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
343-
# steps:
344-
# - name: Set up Python ${{ matrix.python-version }}
345-
# uses: actions/setup-python@v6
346-
# with:
347-
# python-version: ${{ matrix.python-version }}
348-
# - name: Download wheel (non-stable-ABI)
349-
# if: matrix.python-version == '3.10' || matrix.python-version == '3.11'
350-
# uses: actions/download-artifact@v8
351-
# with:
352-
# name: Windows_${{ matrix.python-version }}_wheel
353-
# path: wheelhouse/
354-
# - name: Download wheel (stable-ABI)
355-
# if: matrix.python-version == '3.12' || matrix.python-version == '3.13' || matrix.python-version == '3.14'
356-
# uses: actions/download-artifact@v8
357-
# with:
358-
# name: Windows_3.12_wheel
359-
# path: wheelhouse/
360-
# - name: Install wheel
361-
# shell: bash
362-
# run: for i in wheelhouse/pytket-*.whl ; do pip install $i ; done
363-
# - uses: actions/checkout@v6
364-
# with:
365-
# path: tket
366-
# - name: Run tests
367-
# run: |
368-
# pip install pytest hypothesis
369-
# cd tket/pytket/tests
370-
# pip install -r requirements.txt
371-
# pytest --ignore=simulator/
334+
test_Windows_wheels:
335+
name: Test Windows wheels
336+
needs: build_Windows_wheels
337+
runs-on: windows-2022
338+
strategy:
339+
matrix:
340+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
341+
steps:
342+
- name: Set up Python ${{ matrix.python-version }}
343+
uses: actions/setup-python@v6
344+
with:
345+
python-version: ${{ matrix.python-version }}
346+
- name: Download wheel (non-stable-ABI)
347+
if: matrix.python-version == '3.10' || matrix.python-version == '3.11'
348+
uses: actions/download-artifact@v8
349+
with:
350+
name: Windows_${{ matrix.python-version }}_wheel
351+
path: wheelhouse/
352+
- name: Download wheel (stable-ABI)
353+
if: matrix.python-version == '3.12' || matrix.python-version == '3.13' || matrix.python-version == '3.14'
354+
uses: actions/download-artifact@v8
355+
with:
356+
name: Windows_3.12_wheel
357+
path: wheelhouse/
358+
- name: Install wheel
359+
shell: bash
360+
run: for i in wheelhouse/pytket-*.whl ; do pip install $i ; done
361+
- uses: actions/checkout@v6
362+
with:
363+
path: tket
364+
- name: Run tests
365+
run: |
366+
pip install pytest hypothesis
367+
cd tket/pytket/tests
368+
pip install -r requirements.txt
369+
pytest --ignore=simulator/
372370
373371
publish_to_pypi:
374372
name: Publish to pypi
375373
if: github.event_name == 'release'
376-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
377-
# needs: [test_linux_wheels, test_linux_aarch64_wheels, test_macos_x86_wheels, test_macos_arm64_wheels, test_Windows_wheels]
378-
needs: [test_linux_wheels, test_linux_aarch64_wheels, test_macos_x86_wheels, test_macos_arm64_wheels]
374+
needs: [test_linux_wheels, test_linux_aarch64_wheels, test_macos_x86_wheels, test_macos_arm64_wheels, test_Windows_wheels]
379375
runs-on: ubuntu-latest
380376
environment:
381377
name: release

‎.github/workflows/test_libs.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
67-
# os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2025']
68-
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26']
66+
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2022']
6967
lib: ${{ fromJson(needs.set_libs_matrix.outputs.libs) }}
7068
runs-on: ${{ matrix.os }}
7169
steps:

‎.github/workflows/test_libs_all.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ jobs:
1010
name: test library
1111
strategy:
1212
matrix:
13-
# Temporarily disabling Windows builds (https://github.com/Quantinuum/tket/issues/2153).
14-
# os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2025']
15-
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26']
13+
os: ['ubuntu-24.04', 'macos-15', 'macos-15-intel', 'macos-26', 'windows-2022']
1614
lib: ['tklog', 'tkassert', 'tkrng', 'tktokenswap', 'tkwsm']
1715
runs-on: ${{ matrix.os }}
1816
steps:

‎TKET_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.81
1+
2.1.82

‎conan-profiles/windows-2022‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[settings]
2+
arch=x86_64
3+
build_type=Release
4+
compiler=msvc
5+
compiler.cppstd=14
6+
compiler.runtime=dynamic
7+
compiler.version=194
8+
os=Windows

0 commit comments

Comments
 (0)