From e48797db1adc31876d37711401f74cdb5cd3bfa4 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 1 May 2025 12:57:46 +0200 Subject: [PATCH] CI: Only run unit tests for pull requests --- .ci/build-linux-aarch64.sh | 4 ++-- .ci/build-linux.sh | 4 ++-- .ci/docker.env | 1 + .github/workflows/rpcs3.yml | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh index f53a24d249..e067f23445 100755 --- a/.ci/build-linux-aarch64.sh +++ b/.ci/build-linux-aarch64.sh @@ -43,8 +43,8 @@ cmake .. \ -DOpenGL_GL_PREFERENCE=LEGACY \ -DLLVM_DIR=/opt/llvm/lib/cmake/llvm \ -DSTATIC_LINK_LLVM=ON \ - -DBUILD_RPCS3_TESTS=ON \ - -DRUN_RPCS3_TESTS=ON \ + -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}" \ + -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}" \ -G Ninja ninja; build_status=$?; diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index f44efea2a4..4d9e9d0d09 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -54,8 +54,8 @@ cmake .. \ -DOpenGL_GL_PREFERENCE=LEGACY \ -DLLVM_DIR=/opt/llvm/lib/cmake/llvm \ -DSTATIC_LINK_LLVM=ON \ - -DBUILD_RPCS3_TESTS=ON \ - -DRUN_RPCS3_TESTS=ON \ + -DBUILD_RPCS3_TESTS="${RUN_UNIT_TESTS}" \ + -DRUN_RPCS3_TESTS="${RUN_UNIT_TESTS}" \ -G Ninja ninja; build_status=$?; diff --git a/.ci/docker.env b/.ci/docker.env index 2b36fb34c0..ee037bfb4d 100644 --- a/.ci/docker.env +++ b/.ci/docker.env @@ -8,6 +8,7 @@ BUILD_SOURCEBRANCHNAME APPDIR ARTDIR RELEASE_MESSAGE +RUN_UNIT_TESTS # Variables for build matrix COMPILER DEPLOY_APPIMAGE diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 01fa18ecab..2f68adefd5 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -56,6 +56,7 @@ jobs: COMPILER: ${{ matrix.compiler }} UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }} UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }} + RUN_UNIT_TESTS: github.event_name == 'pull_request' && 'ON' || 'OFF' steps: - name: Checkout repository uses: actions/checkout@main @@ -180,6 +181,7 @@ jobs: run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:PreferredToolArchitecture=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets" - name: Run Unit Tests + if: github.event_name == 'pull_request' shell: pwsh run: build\lib\Release-x64\rpcs3_test.exe