Update test.yml

ArtemS2 · Nov 6, 2024 · 94ca370 · 94ca370
1 parent 9df45c5
commit 94ca370
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -82,15 +82,9 @@ jobs:
 
       - name: Configure project with CMake
         if: matrix.os == 'windows-latest'
-        run: >
-          cmake -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake 
-          -B win_x${{ steps.strings.outputs.arch }}
-          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -DBUILD_D3_MOD=OFF -DBUILD_Q4=OFF -DBUILD_PREY=OFF -DBUILD_Q4_MOD=OFF 
-          -A ${{ matrix.bits == 32 && 'Win32' || 'x64' }}
-          CMakeLists.txt
+        run: |
+          cd Q3E\src\main\jni\doom3\neo
+          cmake -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -B win_x${{ steps.strings.outputs.arch }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_D3_MOD=OFF -DBUILD_Q4=OFF -DBUILD_PREY=OFF -DBUILD_Q4_MOD=OFF -A ${{ matrix.bits == 32 && 'Win32' || 'x64' }} CMakeLists.txt
 
       - name: Build with Ninja
         if: matrix.os == 'windows-latest'
@@ -100,16 +94,16 @@ jobs:
       - name: Copy OpenAL32.dll
         if: matrix.os == 'windows-latest'
         run: |
-          xcopy /Y/Q ${{ github.workspace }}\vcpkg\packages\openal-soft_x${{ steps.strings.outputs.arch }}-windows\bin\OpenAL32.dll Q3E\src\main\jni\doom3\neo\win_x${{ steps.strings.outputs.arch }}\Release\
+          xcopy /Y/Q ${{ github.workspace }}\vcpkg\packages\openal-soft_x${{ steps.strings.outputs.arch }}-windows\bin\OpenAL32.dll win_x${{ steps.strings.outputs.arch }}\Release\
 
       - name: Prepare package
         if: matrix.os == 'windows-latest'
         id: prepare_package
         run: |
-          dir Q3E\src\main\jni\doom3\neo\Release
+          dir win_x${{ steps.strings.outputs.arch }}\Release
           mkdir Release
-          xcopy /Y/Q Q3E\src\main\jni\doom3\neo\win_x${{ steps.strings.outputs.arch }}\Release\*.dll windows_x${{ steps.strings.outputs.arch }}_release\
-          xcopy /Y/Q Q3E\src\main\jni\doom3\neo\win_x${{ steps.strings.outputs.arch }}\Release\*.exe windows_x${{ steps.strings.outputs.arch }}_release\
+          xcopy /Y/Q win_x${{ steps.strings.outputs.arch }}\Release\*.dll windows_x${{ steps.strings.outputs.arch }}_release\
+          xcopy /Y/Q win_x${{ steps.strings.outputs.arch }}\Release\*.exe windows_x${{ steps.strings.outputs.arch }}_release\
           dir windows_x${{ steps.strings.outputs.arch }}_release
 
       - name: Package(64)