diff --git a/.github/workflows/benchmark_commits.yml b/.github/workflows/benchmark_commits.yml index 7580ef56146..5d8411d8208 100644 --- a/.github/workflows/benchmark_commits.yml +++ b/.github/workflows/benchmark_commits.yml @@ -18,7 +18,7 @@ jobs: needs: [start_ec2_runner] if: | always() && - !cancelled() + !cancelled() && false runs-on: ${{ needs.start_ec2_runner.outputs.label }} container: ${{ inputs.cibw_image_tag}} env: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7097864ad0..15b93443ae0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] @@ -139,6 +139,7 @@ jobs: python_deps_ids: ${{toJson(matrix.python_deps_ids)}} cpp-test-linux: + if: false needs: [cibw_docker_image, common_config] name: Linux C++ Tests uses: ./.github/workflows/build_steps.yml @@ -150,12 +151,13 @@ jobs: matrix: ${{needs.common_config.outputs.linux_matrix}} build-python-wheels-linux: + if: false # Then use the cached compilation artifacts to build other python versions concurrently in cibuildwheels needs: [cibw_docker_image, common_config] strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}} include: - python_deps_ids: [""] matrix_override: ${{fromJson(needs.common_config.outputs.linux_matrix)}} @@ -222,7 +224,7 @@ jobs: strategy: fail-fast: false matrix: - python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11]')}} + python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[11]')}} arcticdb_version: ["oldest", "latest"] include: - python_deps_ids: [""] diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 333ea47d632..619346a2f83 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -69,10 +69,16 @@ jobs: defaults: run: {shell: bash} steps: + - name: Download VS2022 BuildTools 17.11.5 + if: matrix.os == 'windows' + run: | + 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" + - name: Checkout uses: actions/checkout@v3.3.0 with: submodules: recursive # Just in case a dep has its own third-party deps + fetch_depth: 0 - name: Configure sccache uses: mozilla-actions/sccache-action@v0.0.3 @@ -81,25 +87,21 @@ jobs: - name: Windows Pagefile if: matrix.os == 'windows' - uses: al-cheb/configure-pagefile-action@v1.3 + uses: al-cheb/configure-pagefile-action@v1.4 with: minimum-size: 2GB maximum-size: 6GB disk-root: "D:" # This is also the checkout directory. Total size 12GB. continue-on-error: true - - - name: Enable Windows compiler commands - if: matrix.os == 'windows' - uses: ilammy/msvc-dev-cmd@v1.12.1 - name: Extra envs # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets run: | HOME=~ . build_tooling/vcpkg_caching.sh # Linux build-python-wheels needs another call in CIBW - echo -e "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES - VCPKG_ROOT=$PLATFORM_VCPKG_ROOT - ${{matrix.envs || ''}}" | tee -a $GITHUB_ENV - cmake -P cpp/CMake/CpuCount.cmake | sed 's/^-- //' | tee -a $GITHUB_ENV + echo -e "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES\n" >> $GITHUB_ENV + echo -e "${{matrix.envs || ''}}\n" >> $GITHUB_ENV + echo -e "VCPKG_ROOT=$PLATFORM_VCPKG_ROOT\n" >> $GITHUB_ENV + cmake -P cpp/CMake/CpuCount.cmake | sed 's/^-- //' >> $GITHUB_ENV env: CMAKE_BUILD_PARALLEL_LEVEL: ${{vars.CMAKE_BUILD_PARALLEL_LEVEL}} @@ -122,19 +124,27 @@ jobs: if: inputs.job_type != 'build-python-wheels' run: . build_tooling/prep_cpp_build.sh # Also applies to Windows - - name: CMake compile - if: inputs.job_type != 'build-python-wheels' - # We are pinning the version to 10.6 because >= 10.7, use node20 which is not supported in the container - uses: lukka/run-cmake@v10.6 - with: - cmakeListsTxtPath: ${{github.workspace}}/cpp/CMakeLists.txt - configurePreset: ${{env.ARCTIC_CMAKE_PRESET}} - configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build']" - buildPreset: ${{env.ARCTIC_CMAKE_PRESET}} + - name: (Custom) CMake compile + if: matrix.os == 'windows' + run: | + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat" -vcvars_ver="14.41" + cmake --preset ${{env.ARCTIC_CMAKE_PRESET}} -DCMAKE_CXX_COMPILER="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.41.34120\bin\Hostx64\x64\cl.exe" -DCMAKE_C_COMPILER="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC\14.41.34120\bin\Hostx64\x64\cl.exe" -DVCPKG_INSTALL_OPTIONS=--clean-after-build -S "${{github.workspace}}/cpp/" + + #- name: CMake compile + # if: inputs.job_type != 'build-python-wheels' && matrix.os == 'windows' + # # We are pinning the version to 10.6 because >= 10.7, use node20 which is not supported in the container + # uses: lukka/run-cmake@v10.6 + # with: + # cmakeListsTxtPath: ${{github.workspace}}/cpp/CMakeLists.txt + # configurePreset: ${{env.ARCTIC_CMAKE_PRESET}} + # configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build', '-T v143,version=14.41']" + # buildPreset: ${{env.ARCTIC_CMAKE_PRESET}} - name: Compile C++ tests if: inputs.job_type == 'cpp-tests' - run: cd cpp; cmake --build --preset $ARCTIC_CMAKE_PRESET --target install + run: | + "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat" -vcvars_ver="14.41" + cmake --build --preset ${{env.ARCTIC_CMAKE_PRESET}} T --target install -S "${{github.workspace}}/cpp/" - name: C++ Rapidcheck if: inputs.job_type == 'cpp-tests' diff --git a/.github/workflows/build_with_conda.yml b/.github/workflows/build_with_conda.yml index c4ef35d16ee..885c04dc8c0 100644 --- a/.github/workflows/build_with_conda.yml +++ b/.github/workflows/build_with_conda.yml @@ -23,7 +23,7 @@ jobs: linux: if: | always() && - !cancelled() + !cancelled() && false runs-on: ubuntu-22.04 env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json index 6368c19ba71..3085eac42f5 100644 --- a/cpp/CMakePresets.json +++ b/cpp/CMakePresets.json @@ -60,7 +60,7 @@ { "name": "windows", "hidden": true, - "generator": "Ninja", + "generator": "Visual Studio 17 2022", "environment": { "cmakepreset_expected_host_system": "Windows" }, "cacheVariables": { "ARCTICDB_USE_PCH": "ON" @@ -68,21 +68,11 @@ }, { "name": "windows-cl-debug", - "inherits": ["common_vcpkg", "windows"], - "description": "Debug features enabled, but linked against release Python", - "architecture": { - "value": "x64", - "strategy": "external" - }, - "toolset": { - "value": "host=x64", - "strategy": "external" - }, + "inherits": [ "common_vcpkg", "windows" ], "cacheVariables": { - "CMAKE_C_COMPILER": "cl", - "CMAKE_CXX_COMPILER": "cl", "VCPKG_TARGET_TRIPLET": "x64-windows-static" - } + }, + "description": "Debug features enabled, but linked against release Python" }, { "name": "windows-cl-conda-debug",