From 69a3985f9d0f29196db54f8f859d91064c0d3ab0 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Tue, 16 Jun 2026 09:32:53 +0800 Subject: [PATCH] [Fix] (ci): reuse MobileGL artifact for retrace --- .github/workflows/ci.yml | 14 ++++++++++++++ tools/trace_replay/CMakeLists.txt | 11 +++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34e3578a..7b1e79cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,8 +190,10 @@ jobs: retrace: runs-on: ubuntu-latest + needs: build-linux env: BUILD_DIR: build-retrace + MOBILEGL_LIBRARY: ${{ github.workspace }}/build-linux/libMobileGL.so steps: - name: Set Swap Space @@ -230,6 +232,17 @@ jobs: ld.lld-20 --version || ld.lld --version || true dpkg -l 'libc++*' 'libegl*' 'libgles*' 'mesa*' 'vulkan*' || true + - name: Download Linux runtime + uses: actions/download-artifact@v4 + with: + name: mobilegl-linux-runtime + path: . + + - name: Unpack Linux runtime + run: | + tar -xzf mobilegl-linux-runtime.tgz + test -f "${MOBILEGL_LIBRARY}" + - name: Configure CMake run: | if [ "${{ secrets.ACTIONS_STEP_DEBUG }}" = "true" ]; then @@ -245,6 +258,7 @@ jobs: -DMOBILEGL_BUILD_TEST=OFF \ -DMOBILEGL_BUILD_BENCHMARK=OFF \ -DMOBILEGL_BUILD_TRACE_REPLAY=ON \ + -DMOBILEGL_TRACE_REPLAY_MOBILEGL_LIBRARY="${MOBILEGL_LIBRARY}" \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 - name: Build trace replay diff --git a/tools/trace_replay/CMakeLists.txt b/tools/trace_replay/CMakeLists.txt index 743d4b64..81a2ffc3 100644 --- a/tools/trace_replay/CMakeLists.txt +++ b/tools/trace_replay/CMakeLists.txt @@ -10,6 +10,7 @@ set(MOBILEGL_TRACE_SHARED_CPP_DIR "${CMAKE_SOURCE_DIR}/android-plugin/app/src/tr set(APITRACE_ROOT "${CMAKE_SOURCE_DIR}/android-plugin/third_party/apitrace") set(APITRACE_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/apitrace") set(APITRACE_VERSION "mobilegl-trace") +set(MOBILEGL_TRACE_REPLAY_MOBILEGL_LIBRARY "" CACHE FILEPATH "Existing libMobileGL.so to use for trace replay tests") find_package(Python3 REQUIRED) find_package(Threads REQUIRED) @@ -254,7 +255,13 @@ target_link_libraries(mobilegl_trace_replay PRIVATE mobilegl_trace_apitrace_os "-Wl,--end-group" dl) -add_dependencies(mobilegl_trace_replay MobileGL) + +if(MOBILEGL_TRACE_REPLAY_MOBILEGL_LIBRARY) + set(mobilegl_trace_replay_mobilegl_library "${MOBILEGL_TRACE_REPLAY_MOBILEGL_LIBRARY}") +else() + set(mobilegl_trace_replay_mobilegl_library "$") + add_dependencies(mobilegl_trace_replay MobileGL) +endif() enable_testing() function(add_openra_trace_replay_test BACKEND) @@ -262,7 +269,7 @@ function(add_openra_trace_replay_test BACKEND) NAME MobileGLTraceReplay.OpenRA.${BACKEND} COMMAND "${CMAKE_COMMAND}" -DTRACE_REPLAY_EXE=$ - -DMOBILEGL_LIBRARY=$ + -DMOBILEGL_LIBRARY=${mobilegl_trace_replay_mobilegl_library} -DOPENRA_TRACE_ARCHIVE=${MOBILEGL_TRACE_ROOT}/fixtures/openra.tgz -DOPENRA_GOLDEN=${MOBILEGL_TRACE_ROOT}/fixtures/openra.0000031249.png -DOPENRA_BACKEND=${BACKEND}