Skip to content

Commit

Permalink
Merge pull request #283 from chfast/ci-windows
Browse files Browse the repository at this point in the history
Enable 32-bit Windows build in CircleCI
  • Loading branch information
chfast authored Jan 24, 2023
2 parents 1e964da + 24daa0a commit 42750ef
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
version: 2.1
orbs:
win: circleci/[email protected]

executors:
linux-gcc-latest:
Expand Down Expand Up @@ -287,6 +289,38 @@ jobs:
- build_and_test
- benchmark

windows-32bit:
executor: win/server-2022
steps:
- checkout
- run:
name: "Setup environment (bash)"
shell: bash
command: |
echo 'export PATH=$PATH:"/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin"' >> $BASH_ENV
- run:
name: 'Configure'
shell: powershell
command: |
$ErrorActionPreference = "Stop"
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
which cmake
cmake -S . -B ~/build -G Ninja -DCMAKE_INSTALL_PREFIX=C:\install -DCMAKE_BUILD_TYPE=Release -DINTX_BENCHMARKING=OFF
- run:
name: 'Build'
shell: powershell
command: |
$ErrorActionPreference = "Stop"
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
cmake --build ~/build
- run:
name: 'Test'
shell: powershell
working_directory: ~/build
command: |
$ErrorActionPreference = "Stop"
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
ctest -j4 --output-on-failure --schedule-random
cmake-min:
docker:
Expand All @@ -312,3 +346,4 @@ workflows:
- cmake-min
- arm64
- powerpc64
- windows-32bit
2 changes: 1 addition & 1 deletion include/intx/intx.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ inline constexpr uint128 umul(uint64_t x, uint64_t y) noexcept
{
#if INTX_HAS_BUILTIN_INT128
return builtin_uint128{x} * builtin_uint128{y};
#elif defined(_MSC_VER) && _MSC_VER >= 1925
#elif defined(_MSC_VER) && _MSC_VER >= 1925 && defined(_M_X64)
if (!is_constant_evaluated())
{
unsigned __int64 hi = 0;
Expand Down

0 comments on commit 42750ef

Please sign in to comment.