Skip to content

Commit 8ebb16f

Browse files
authored
Upgrade to Bochs 2.8 (#27)
1 parent d2bf680 commit 8ebb16f

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

.github/build-bochscpu.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mkdir bxbuild
1212
cd bxbuild
1313

1414
REM Use WSL to configure / clone the repositories.
15-
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"
15+
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"
1616

1717
REM Build bochs; libinstrument.a is expected to fail to build so don't freak out.
1818
REM You can run nmake all-clean to clean up the build.

.github/build-bochscpu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ mkdir bxbuild
1414
cd bxbuild
1515

1616
git clone https://github.com/yrp604/bochscpu-build.git
17-
git clone https://github.com/hugsy/bochscpu.git
17+
git clone https://github.com/yrp604/bochscpu.git
1818
git clone https://github.com/yrp604/bochscpu-ffi.git
1919

2020
cd bochscpu-build
21-
bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU}|| true
21+
bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU} || true
2222

2323
# Remove old files in bochscpu.
2424
rm -rf ../../../bochscpu/bochs

.github/workflows/build.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ on:
1010

1111
env:
1212
NB_CPU: 1
13-
VERSION: '0.3'
13+
VERSION: '0.3.1'
14+
BOCHS_REV: REL_2_8_FINAL
1415

1516
jobs:
1617
bochscpu:
17-
env:
18-
BOCHS_REV: 8dd9649389c813a189e3f702d58cdedb93730343
1918
strategy:
2019
fail-fast: false
2120
matrix:
@@ -76,13 +75,13 @@ jobs:
7675
uses: actions/upload-artifact@v4
7776
with:
7877
if-no-files-found: error
79-
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
78+
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }}
8079
path: artifact
8180

8281
bindings:
8382
needs: bochscpu
8483
strategy:
85-
fail-fast: false
84+
fail-fast: true
8685
matrix:
8786
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
8887
variant:
@@ -102,7 +101,7 @@ jobs:
102101
uses: actions/download-artifact@v4
103102
id: download_artifact
104103
with:
105-
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
104+
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }}
106105
path: bochscpu-artifact
107106

108107
- name: Setup BochsCPU libs

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
77
project(
88
bochscpu-python
99
LANGUAGES CXX
10-
VERSION 0.3
10+
VERSION 0.3.1
1111
DESCRIPTION "Python bindings for BochsCPU"
1212
HOMEPAGE_URL https://github.com/hugsy/bochscpu-python
1313
)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
44

55
[project]
66
name = "bochscpu-python"
7-
version = "0.3"
7+
version = "0.3.1"
88
description = "Python bindings for BochsCPU."
99
readme = "./README.md"
1010
license.file = "./LICENSE"

python/src/bochscpu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ PyType_Slot slots[] = {
4848
NB_MODULE(_bochscpu, m)
4949
{
5050
m.doc() = "The native `bochscpu` module";
51-
m.attr("__version__") = "0.3";
51+
m.attr("__version__") = "0.3.1";
5252

5353
//
5454
// Submodules

0 commit comments

Comments
 (0)