Skip to content

Commit 696654a

Browse files
author
Vasil Pashov
committed
Rollback MSVC version
1 parent 8ee3763 commit 696654a

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

.github/workflows/benchmark_commits.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
needs: [start_ec2_runner]
1919
if: |
2020
always() &&
21-
!cancelled()
21+
!cancelled() && false
2222
runs-on: ${{ needs.start_ec2_runner.outputs.label }}
2323
container: ${{ inputs.cibw_image_tag}}
2424
env:

.github/workflows/build.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
strategy:
101101
fail-fast: false
102102
matrix:
103-
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}}
103+
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}}
104104
arcticdb_version: ["oldest", "latest"]
105105
include:
106106
- python_deps_ids: [""]
@@ -139,6 +139,7 @@ jobs:
139139
python_deps_ids: ${{toJson(matrix.python_deps_ids)}}
140140

141141
cpp-test-linux:
142+
if: false
142143
needs: [cibw_docker_image, common_config]
143144
name: Linux C++ Tests
144145
uses: ./.github/workflows/build_steps.yml
@@ -150,12 +151,13 @@ jobs:
150151
matrix: ${{needs.common_config.outputs.linux_matrix}}
151152

152153
build-python-wheels-linux:
154+
if: false
153155
# Then use the cached compilation artifacts to build other python versions concurrently in cibuildwheels
154156
needs: [cibw_docker_image, common_config]
155157
strategy:
156158
fail-fast: false
157159
matrix:
158-
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}}
160+
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}}
159161
include:
160162
- python_deps_ids: [""]
161163
matrix_override: ${{fromJson(needs.common_config.outputs.linux_matrix)}}
@@ -222,7 +224,7 @@ jobs:
222224
strategy:
223225
fail-fast: false
224226
matrix:
225-
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}}
227+
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}}
226228
arcticdb_version: ["oldest", "latest"]
227229
include:
228230
- python_deps_ids: [""]

.github/workflows/build_steps.yml

+17-5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@ jobs:
6969
defaults:
7070
run: {shell: bash}
7171
steps:
72+
- name: Download VS2022 BuildTools 17.11.5
73+
if: matrix.os == 'windows'
74+
run: |
75+
choco install -y visualstudio2022enterprise --version=117.11.5 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/150476627_138095015/channel"
76+
#choco install -y visualstudio2022buildtools --version=117.11.5 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/150476627_138095015/channel"
77+
choco install -y ninja
78+
#echo "CC=\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64\\x64\\cl.exe\"" >> $GITHUB_ENV
79+
#echo "CXX=\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Tools\\MSVC\\14.41.34120\\bin\\Hostx64\\x64\\cl.exe\"" >> $GITHUB_ENV
80+
#"C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat"
81+
82+
- name: Enable Windows compiler commands
83+
if: matrix.os == 'windows'
84+
uses: ilammy/[email protected]
85+
with:
86+
vsversion: 17.11
87+
7288
- name: Checkout
7389
uses: actions/[email protected]
7490
with:
@@ -81,16 +97,12 @@ jobs:
8197

8298
- name: Windows Pagefile
8399
if: matrix.os == 'windows'
84-
uses: al-cheb/configure-pagefile-action@v1.3
100+
uses: al-cheb/configure-pagefile-action@v1.4
85101
with:
86102
minimum-size: 2GB
87103
maximum-size: 6GB
88104
disk-root: "D:" # This is also the checkout directory. Total size 12GB.
89105
continue-on-error: true
90-
91-
- name: Enable Windows compiler commands
92-
if: matrix.os == 'windows'
93-
uses: ilammy/[email protected]
94106

95107
- name: Extra envs
96108
# This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets

.github/workflows/build_with_conda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
linux:
2424
if: |
2525
always() &&
26-
!cancelled()
26+
!cancelled() && false
2727
runs-on: ubuntu-22.04
2828
env:
2929
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

0 commit comments

Comments
 (0)