diff --git a/.github/build-bochscpu.bat b/.github/build-bochscpu.bat index 98d136f..54ac74f 100644 --- a/.github/build-bochscpu.bat +++ b/.github/build-bochscpu.bat @@ -12,7 +12,7 @@ mkdir bxbuild cd bxbuild REM Use WSL to configure / clone the repositories. -bash -c "git clone https://github.com/yrp604/bochscpu-build.git && git clone https://github.com/hugsy/bochscpu.git && git clone https://github.com/yrp604/bochscpu-ffi.git && cd bochscpu-build && bash prep.sh && cd Bochs/bochs && bash .conf.cpu-msvc" +bash -c "git clone https://github.com/yrp604/bochscpu-build.git && git clone https://github.com/yrp604/bochscpu.git && git clone https://github.com/yrp604/bochscpu-ffi.git && cd bochscpu-build && bash prep.sh && cd Bochs/bochs && bash .conf.cpu-msvc" REM Build bochs; libinstrument.a is expected to fail to build so don't freak out. REM You can run nmake all-clean to clean up the build. diff --git a/.github/build-bochscpu.sh b/.github/build-bochscpu.sh index 4e20742..1224dec 100644 --- a/.github/build-bochscpu.sh +++ b/.github/build-bochscpu.sh @@ -14,11 +14,11 @@ mkdir bxbuild cd bxbuild git clone https://github.com/yrp604/bochscpu-build.git -git clone https://github.com/hugsy/bochscpu.git +git clone https://github.com/yrp604/bochscpu.git git clone https://github.com/yrp604/bochscpu-ffi.git cd bochscpu-build -bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU}|| true +bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU} || true # Remove old files in bochscpu. rm -rf ../../../bochscpu/bochs diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b110f1f..8e17251 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,12 +10,11 @@ on: env: NB_CPU: 1 - VERSION: '0.3' + VERSION: '0.3.1' + BOCHS_REV: REL_2_8_FINAL jobs: bochscpu: - env: - BOCHS_REV: 8dd9649389c813a189e3f702d58cdedb93730343 strategy: fail-fast: false matrix: @@ -76,13 +75,13 @@ jobs: uses: actions/upload-artifact@v4 with: if-no-files-found: error - name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }} + name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }} path: artifact bindings: needs: bochscpu strategy: - fail-fast: false + fail-fast: true matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] variant: @@ -102,7 +101,7 @@ jobs: uses: actions/download-artifact@v4 id: download_artifact with: - name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }} + name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }} path: bochscpu-artifact - name: Setup BochsCPU libs diff --git a/CMakeLists.txt b/CMakeLists.txt index e334159..fcbf6ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION True) project( bochscpu-python LANGUAGES CXX - VERSION 0.3 + VERSION 0.3.1 DESCRIPTION "Python bindings for BochsCPU" HOMEPAGE_URL https://github.com/hugsy/bochscpu-python ) diff --git a/pyproject.toml b/pyproject.toml index 5eb14b8..77c0b6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "bochscpu-python" -version = "0.3" +version = "0.3.1" description = "Python bindings for BochsCPU." readme = "./README.md" license.file = "./LICENSE" diff --git a/python/src/bochscpu.cpp b/python/src/bochscpu.cpp index c63d429..e061bf1 100644 --- a/python/src/bochscpu.cpp +++ b/python/src/bochscpu.cpp @@ -48,7 +48,7 @@ PyType_Slot slots[] = { NB_MODULE(_bochscpu, m) { m.doc() = "The native `bochscpu` module"; - m.attr("__version__") = "0.3"; + m.attr("__version__") = "0.3.1"; // // Submodules