@@ -30,63 +30,60 @@ jobs:
3030 strategy :
3131 matrix :
3232 os : [ubuntu-latest, macos-latest, windows-latest]
33- python-version : ["3.11", "3.12", "3.13"]
34- cibuildwheel : ["cp311", "cp312", "cp313"]
35- exclude :
36- - python-version : " 3.11"
37- cibuildwheel : " cp312"
38- - python-version : " 3.11"
39- cibuildwheel : " cp313"
40- - python-version : " 3.12"
41- cibuildwheel : " cp311"
42- - python-version : " 3.12"
43- cibuildwheel : " cp313"
44- - python-version : " 3.13"
33+ python :
34+ - version : " 3.11"
4535 cibuildwheel : " cp311"
46- - python-version : " 3.13"
36+ primary : true
37+ - version : " 3.12"
4738 cibuildwheel : " cp312"
39+ <<<<<<< before updating
4840
4941 steps :
5042 - uses : actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
43+ =======
44+ primary : false
45+ - version : " 3.13"
46+ cibuildwheel : " cp313"
47+ primary : false
48+ >>>>>>> after updating
5149
52- - uses : actions-ext/python/setup@main
50+ steps :
51+ - uses : actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5352 with :
54- version : ${{ matrix.python-version }}
53+ persist-credentials : false
5554
56- - name : Install dependencies
57- run : make develop
58- if : matrix.os != 'windows-latest'
55+ - uses : actions-ext/python/setup@6e1b91a408ea89f49bc8aff8724f83826f7b5446
56+ with :
57+ version : ${{ matrix.python.version }}
58+
59+ - uses : actions-ext/cpp/setup@51c484ef64088c62434226039d0e3359f5fc8df6
5960
6061 - name : Install dependencies
61- run : |
62- for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do call "%%i\VC\Auxiliary\Build\vcvars64.bat"
63- make develop
64- shell : cmd
65- if : matrix.os == 'windows-latest'
62+ run : make develop
6663
6764 - name : Lint
6865 run : make lint
69- if : matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
66+ if : matrix.os == 'ubuntu-latest' && matrix.python.primary
7067
7168 - name : Checks
7269 run : make checks
73- if : matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
70+ if : matrix.os == 'ubuntu-latest' && matrix.python.primary
7471
7572 - name : Test
7673 run : make coverage
7774
7875 - name : Upload test results (Python)
79- uses : actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
76+ uses : actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
8077 with :
81- name : test-results-${{ matrix.os }}-${{ matrix.python- version }}
78+ name : test-results-${{ matrix.os }}-${{ matrix.python. version }}
8279 path : junit.xml
83- if : matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
80+ if : matrix.os == 'ubuntu-latest' && matrix.python.primary
8481
8582 - name : Publish Unit Test Results
8683 uses : EnricoMi/publish-unit-test-result-action@d0a4676d0e0b938bc201470d88276b7c74c712b3 # v2.24.0
8784 with :
8885 files : ' **/junit.xml'
89- if : matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
86+ if : matrix.os == 'ubuntu-latest' && matrix.python.primary
9087
9188 - name : Upload coverage
9289 uses : codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
@@ -103,7 +100,7 @@ jobs:
103100 make dist-py-wheel
104101 make dist-check
105102 env :
106- CIBW_BUILD : " ${{ matrix.cibuildwheel }}-manylinux*"
103+ CIBW_BUILD : " ${{ matrix.python. cibuildwheel }}-manylinux*"
107104 CIBW_BUILD_VERBOSITY : 3
108105 if : matrix.os == 'ubuntu-latest'
109106
@@ -112,32 +109,29 @@ jobs:
112109 rm -rf dist
113110 make dist-py-wheel
114111 env :
115- CIBW_BUILD : " ${{ matrix.cibuildwheel }}-macos*"
112+ CIBW_BUILD : " ${{ matrix.python. cibuildwheel }}-macos*"
116113 CIBW_BUILD_VERBOSITY : 3
117114 if : matrix.os == 'macos-latest'
118115
119116 - name : Make dist (Windows)
120117 run : |
121- if exist dist rmdir /s /q dist
122- for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do call "%%i\VC\Auxiliary\Build\vcvars64.bat"
118+ if (Test-Path dist) { Remove-Item dist -Recurse -Force }
123119 make dist-py-wheel
124- shell : cmd
125120 env :
126- CIBW_BUILD : " ${{ matrix.cibuildwheel }}-win_amd64"
127- CIBW_BEFORE_ALL : for /f "usebackq tokens=*" %i in (`vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do call "%i\VC\Auxiliary\Build\vcvars64.bat"
121+ CIBW_BUILD : " ${{ matrix.python.cibuildwheel }}-win_amd64"
128122 if : matrix.os == 'windows-latest'
129123
130- - uses : actions-ext/python/test-wheel@main
124+ - uses : actions-ext/python/test-wheel@6e1b91a408ea89f49bc8aff8724f83826f7b5446
131125 with :
132126 module : python_template_cpp
133127 if : matrix.os == 'ubuntu-latest'
134128
135- - uses : actions-ext/python/test-sdist@main
129+ - uses : actions-ext/python/test-sdist@6e1b91a408ea89f49bc8aff8724f83826f7b5446
136130 with :
137131 module : python_template_cpp
138132 if : matrix.os == 'ubuntu-latest'
139133
140- - uses : actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
134+ - uses : actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
141135 with :
142- name : dist-${{matrix.os}}-${{matrix.python- version}}
136+ name : dist-${{matrix.os}}-${{matrix.python. version}}
143137 path : dist
0 commit comments