Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/ci-auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ on:
- main

jobs:
ci-auto:
ci-auto-unix:
uses: ./.github/workflows/common.yml
with:
python-version: "3.7"
os: "ubuntu-22.04"
cmake-version: "3.24.x"

ci-auto-windows:
uses: ./.github/workflows/common.yml
with:
python-version: "3.7"
os: "windows-latest"
cmake-version: "3.24.x"
2 changes: 1 addition & 1 deletion .github/workflows/ci-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
os:
description: 'JSON array of OS to be checked'
required: true
default: "[\"ubuntu-22.04\", \"ubuntu-24.04\", \"macos-11\", \"macos-12\", \"macos-13\", \"macos-14\"]"
default: "[\"ubuntu-22.04\", \"ubuntu-24.04\", \"macos-13\", \"macos-14\", \"macos-15\", \"windows-latest\"]"
type: string
python-version:
description: 'JSON array of Python versions to be checked'
Expand Down
39 changes: 20 additions & 19 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ on:
required: false
type: string

env:
CMAKE_MULTIBUILD_CONFIG: "${{ startsWith(inputs.os, 'windows') && '--config Debug' || '' }}"
CMAKE_GIT_EXCLUDE: "${{ startsWith(inputs.os, 'windows') && '-DGIT=OFF' || '' }}"

jobs:
build-all:
runs-on: ${{ inputs.os }}
Expand All @@ -36,20 +40,15 @@ jobs:
- name: Install Rust stable
uses: actions-rs/toolchain@v1.0.6
with:
toolchain: stable
override: true
toolchain: stable
override: true

- name: Build Rust library
working-directory: ./lib
run: |
cargo check
cargo build

- name: Test Rust library
working-directory: ./lib
run: |
RUST_LOG=hyperon=debug cargo test

- name: Install cbindgen
uses: actions-rs/cargo@v1.0.1
with:
Expand All @@ -69,13 +68,19 @@ jobs:
- name: Install Conan
uses: turtlebrowser/get-conan@v1.2
with:
version: "2.5.0"
version: "2.13.0"

- name: Setup Conan profile
shell: bash
run: |
conan profile detect --force

- name: Test Rust build
shell: bash
run: RUST_LOG=hyperon=debug cargo test

- name: Print environment
shell: bash
run: |
echo "uname -a"
uname -a
Expand All @@ -91,12 +96,8 @@ jobs:
which python3
python3 --version
python3 -c "import platform; print(platform.platform())"
echo "conan --version"
conan --version
conan_python=$( head -1 $(which conan) | cut -c 3- )
echo "conan Python: $conan_python"
echo -n "conan Python platform: "
$conan_python -c "import platform; print(platform.platform())"
echo "conan version"
conan version
echo "conan profile show"
conan profile show
echo "gcc --version"
Expand All @@ -114,14 +115,14 @@ jobs:
run: |
mkdir -p build
cd build
# specify C compiler as conan could not find it automatically
# see https://github.com/conan-io/conan/issues/4322
cmake -DPython3_EXECUTABLE=`which python` -DCMAKE_C_COMPILER=gcc ..
cmake ${{ env.CMAKE_GIT_EXCLUDE }} ..

- name: Build C API
working-directory: ./build
run: make
shell: bash
run: cmake --build . ${{ env.CMAKE_MULTIBUILD_CONFIG }}

- name: Test C API
working-directory: ./build
run: make check
shell: bash
run: cmake --build . --target check ${{ env.CMAKE_MULTIBUILD_CONFIG }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN sh /tmp/rustup.sh -y && rm /tmp/rustup.sh
ENV PATH="${PATH}:${HOME}/.cargo/bin"
RUN cargo install cbindgen

RUN python3 -m pip install conan==2.5.0 pip==23.1.2
RUN python3 -m pip install conan==2.13.0 pip==23.1.2
ENV PATH="${PATH}:${HOME}/.local/bin"
RUN conan profile detect --force

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ cargo install --force cbindgen

* Install Conan and make default Conan profile:
```
python3 -m pip install conan==2.5.0
python3 -m pip install conan==2.13.0
conan profile detect --force
```

Expand Down
2 changes: 1 addition & 1 deletion python/install-hyperonc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sh /tmp/rustup.sh -y && rm /tmp/rustup.sh
export PATH="${PATH}:${HOME}/.cargo/bin"
cargo install cbindgen

python3 -m pip install cmake==3.24 conan==2.5.0 pip==23.1.2
python3 -m pip install cmake==3.24 conan==2.13.0 pip==23.1.2
PATH="${PATH}:${HOME}/.local/bin"
conan profile detect --force

Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
# setuptools >68.0.0 is incompatible with macos-13
# setuptools_scm >7.1.0 is incompatible with Python 3.7
requires = ["setuptools==68.0.0", "conan==2.5.0", "cmake==3.24", "setuptools_scm[toml]==7.1.0"]
requires = ["setuptools==68.0.0", "conan==2.13.0", "cmake==3.24", "setuptools_scm[toml]==7.1.0"]
build-backend = "setuptools.build_meta"

[project]
Expand Down
Loading