Skip to content

Commit

Permalink
Merge pull request #1768 from borglab/update-windows-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
varunagrawal committed Jun 28, 2024
2 parents a2a7a06 + 788826a commit 2af2c96
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Python CI

on: [pull_request]

# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
# Every time you make a push to your PR, it cancel immediately the previous checks,
# and start a new one. The other runner will be available more quickly to your PR.
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand All @@ -19,7 +19,7 @@ jobs:
CMAKE_BUILD_TYPE: ${{ matrix.build_type }}
PYTHON_VERSION: ${{ matrix.python_version }}
BOOST_VERSION: 1.72.0
BOOST_EXE: boost_1_72_0-msvc-14.2
BOOST_EXE: boost_1_72_0-msvc-14.2

strategy:
fail-fast: true
Expand Down Expand Up @@ -109,15 +109,15 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x${{matrix.platform}}
toolset: 14.2
toolset: 14.40

- name: cl version (Windows)
if: runner.os == 'Windows'
shell: cmd
run: cl

- name: Setup python (Windows)
uses: actions/setup-python@v4
uses: actions/setup-python@v5
if: runner.os == 'Windows'
with:
python-version: ${{ matrix.python_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: ilammy/msvc-dev-cmd@v1
with:
arch: x${{ matrix.platform }}
toolset: 14.2
toolset: 14.40

- name: cl version
shell: cmd
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
numpy>=1.11.0
numpy>=1.11.0,<2.0.0

0 comments on commit 2af2c96

Please sign in to comment.