Include the 'bochs' folder into the artifact as it is needed for buil…

…ding bxcpu and fix the Windows library files extensions ('.a' -> '.lib') (#5)
yrp604 · Dec 30, 2023 · 7a1e11b · 7a1e11b
1 parent 04e9b86
commit 7a1e11b
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,33 +47,37 @@ jobs:
       if: matrix.variant.os == 'windows-latest'
       shell: powershell
       run: |
+        mkdir -p artifact/lib
         bash -c 'sh prep.sh; cd Bochs/bochs; sh .conf.cpu-msvc;'
         cd Bochs/bochs
         Start-Process nmake -ErrorAction SilentlyContinue -PassThru -Wait
-        cd ../..
-        mkdir lib
-        cp -Verbose Bochs/bochs/cpu/libcpu.a lib/cpu.a
-        cp -Verbose Bochs/bochs/cpu/fpu/libfpu.a lib/fpu.a
-        cp -Verbose Bochs/bochs/cpu/avx/libavx.a lib/avx.a
-        cp -Verbose Bochs/bochs/cpu/cpudb/libcpudb.a lib/cpudb.a
+        cp -Verbose cpu/libcpu.a ../../artifact/lib/cpu.lib
+        cp -Verbose cpu/fpu/libfpu.a ../../artifact/lib/fpu.lib
+        cp -Verbose cpu/avx/libavx.a ../../artifact/lib/avx.lib
+        cp -Verbose cpu/cpudb/libcpudb.a ../../artifact/lib/cpudb.lib
+        Start-Process nmake all-clean -PassThru -Wait
+        cd ..
+        cp -Verbose -r bochs ../artifact/
 
     - name: Build BochsCPU (Linux & MacOS)
       if: matrix.variant.os != 'windows-latest'
       shell: bash
       run: |
+        mkdir -p artifact/lib
         sh prep.sh
         cd Bochs/bochs
         sh .conf.cpu
         make -j ${{ env.NB_CPU }} || true
-        cd ../..
-        mkdir lib
-        cp -v Bochs/bochs/cpu/libcpu.a lib/
-        cp -v Bochs/bochs/cpu/fpu/libfpu.a lib/
-        cp -v Bochs/bochs/cpu/avx/libavx.a lib/
-        cp -v Bochs/bochs/cpu/cpudb/libcpudb.a lib/
+        cp -v cpu/libcpu.a ../../artifact/lib/
+        cp -v cpu/fpu/libfpu.a ../../artifact/lib/
+        cp -v cpu/avx/libavx.a ../../artifact/lib/
+        cp -v cpu/cpudb/libcpudb.a ../../artifact/lib/
+        make all-clean
+        cd ..
+        mv bochs ../artifact/
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v3
       with:
         name: bochscpu-build-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
-        path: lib
+        path: artifact