[CI] Revert to use HEAD for bochscpu-build (#17)

Since yrp604/bochscpu-build#4 was merged

Author: hugsy

.github/build-bochscpu.bat

@@ -12,11 +12,12 @@ 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/yrp604/bochscpu && git clone https://github.com/yrp604/bochscpu-ffi && cd bochscpu-build && BOCHS_REV=c48a50141b6ade6c6b0744280a598b55d906bb9e 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/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"
 
 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.
 cd bochscpu-build\Bochs\bochs
+set CL=/MP
 nmake
 
 REM Remove old files in bochscpu.
@@ -38,8 +39,8 @@ REM Now its time to build it.
 cd ..\..\..\bochscpu-ffi
 REM cargo clean -p bochscpu shits its pants on my computer so rebuilding everything
 cargo clean
-cargo build
-cargo build --release
+cargo build -j %NB_CPU%
+cargo build -j %NB_CPU% --release
 
 REM Get back to where we were.
 popd

.github/build-bochscpu.sh

@@ -8,27 +8,28 @@ set -e
 
 pushd .
 
+test -z $NB_CPU && NB_CPU=1
+
 mkdir bxbuild
 cd bxbuild
 
 git clone https://github.com/yrp604/bochscpu-build.git
-git clone https://github.com/yrp604/bochscpu
-git clone https://github.com/yrp604/bochscpu-ffi
+git clone https://github.com/hugsy/bochscpu.git
+git clone https://github.com/yrp604/bochscpu-ffi.git
 
 cd bochscpu-build
-export BOCHS_REV=c48a50141b6ade6c6b0744280a598b55d906bb9e
-bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make || true
+bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU}|| true
 
 # Remove old files in bochscpu.
 rm -rf ../../../bochscpu/bochs
 rm -rf ../../../bochscpu/lib
 
 # Create the libs directory where we stuff all the libs.
 mkdir ../../../bochscpu/lib
-cp cpu/libcpu.a ../../../bochscpu/lib/libcpu.a
-cp cpu/fpu/libfpu.a ../../../bochscpu/lib/libfpu.a
-cp cpu/avx/libavx.a ../../../bochscpu/lib/libavx.a
-cp cpu/cpudb/libcpudb.a ../../../bochscpu/lib/libcpudb.a
+cp -v cpu/libcpu.a ../../../bochscpu/lib/libcpu.a
+cp -v cpu/fpu/libfpu.a ../../../bochscpu/lib/libfpu.a
+cp -v cpu/avx/libavx.a ../../../bochscpu/lib/libavx.a
+cp -v cpu/cpudb/libcpudb.a ../../../bochscpu/lib/libcpudb.a
 make all-clean
 
 # Now we want to copy the bochs directory over there.
@@ -39,8 +40,8 @@ mv bochs ../../bochscpu/bochs
 cd ../../bochscpu-ffi
 
 cargo clean
-cargo build
-cargo build --release
+cargo build -j ${NB_CPU}
+cargo build -j ${NB_CPU} --release
 
 # Get back to where we were.
 popd

.github/workflows/build.yml

@@ -8,8 +8,13 @@ on:
     tags:
     - 'v*'
 
+env:
+  NB_CPU: 1
+
 jobs:
   bochscpu:
+    env:
+      BOCHS_REV: 8dd9649389c813a189e3f702d58cdedb93730343
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +24,7 @@ jobs:
           - {os: macos-latest, arch: x64}
     runs-on: ${{ matrix.variant.os }}
     name: bochscpu / ${{ matrix.variant.os }} / ${{ matrix.variant.arch }}
-    steps:
+    steps :
     - name: Checkout
       uses: actions/checkout@v3
 
@@ -28,7 +33,19 @@ jobs:
       uses: actions/cache@v3
       with:
         path: artifact
-        key: bochscpu-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-artifact-win-lin
+        key: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }}
+
+    - if: steps.cache-artifacts.outputs.cache-hit != 'true' && matrix.variant.os == 'windows-latest'
+      run: |
+        echo NB_CPU=$env:NUMBER_OF_PROCESSORS | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+
+    - if: steps.cache-artifacts.outputs.cache-hit != 'true' && matrix.variant.os == 'ubuntu-latest'
+      run: |
+        echo "NB_CPU=$(grep -c ^processor /proc/cpuinfo)" >> $GITHUB_ENV
+
+    - if: steps.cache-artifacts.outputs.cache-hit != 'true' && matrix.variant.os == 'macos-latest'
+      run: |
+        echo NB_CPU=$(sysctl -n hw.ncpu) >> $GITHUB_ENV
 
     - uses: microsoft/setup-msbuild@v1
       if: steps.cache-artifacts.outputs.cache-hit != 'true' && matrix.variant.os == 'windows-latest'
@@ -48,7 +65,7 @@ jobs:
     - name: Build BochsCPU (Linux & MacOS)
       if: steps.cache-artifacts.outputs.cache-hit != 'true' && matrix.variant.os != 'windows-latest'
       run: |
-        chmod +x .github/build-bochscpu.sh; .github/build-bochscpu.sh
+        bash .github/build-bochscpu.sh
         mkdir artifact artifact/Release artifact/Debug artifact/RelWithDebInfo
         cp -v bxbuild/bochscpu-ffi/target/release/lib*.a artifact/Release/
         cp -v bxbuild/bochscpu-ffi/target/debug/lib*.a artifact/Debug/
@@ -57,6 +74,7 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
+        if-no-files-found: error
         name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
         path: artifact
 
@@ -74,7 +92,6 @@ jobs:
     runs-on: ${{ matrix.variant.os }}
     name: bindings / ${{ matrix.variant.os }} / ${{ matrix.python-version }} / ${{ matrix.variant.config }}
     env:
-      NB_CPU: 1
       CMAKE_FLAGS: ""
     steps:
     - name: Checkout
@@ -104,8 +121,8 @@ jobs:
     - name: Environment Setup (Windows)
       if: matrix.variant.os == 'windows-latest'
       run: |
-        echo "NB_CPU=$env:NUMBER_OF_PROCESSORS" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        echo "CMAKE_ARCH='-A ${{ matrix.variant.arch }}'" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo NB_CPU=$env:NUMBER_OF_PROCESSORS | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        echo CMAKE_ARCH='-A ${{ matrix.variant.arch }}' | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         Import-Module .\.github\Invoke-VisualStudio.ps1
         Invoke-VisualStudio2022${{ matrix.variant.arch }}