From 6a16caf8ba8bc312b085559fddbd8cd766a55c49 Mon Sep 17 00:00:00 2001 From: SolDev69 <40839581+SolDev69@users.noreply.github.com> Date: Sat, 23 Dec 2023 00:36:15 +0000 Subject: [PATCH] attempt fix ci Change-Id: I6c05c497f0ffa0b4e0d84ad3b52bee19fc7c9d2d --- .github/workflows/android.yml | 39 ++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 1309570fa7..c54f9b10a3 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -37,14 +37,33 @@ jobs: - name: Build SwiftShader shell: bash run: | - git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git - export PATH=`pwd`/depot_tools:$PATH - echo $PATH cd swiftshader - git submodule update --init - cd build - cmake .. - export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH - export CC=clang - export CXX=clang++ - cmake --build . --parallel \ No newline at end of file + git -C SwiftShader submodule init + git -C SwiftShader config submodule."third_party/cppdap".url "$srcdir/cppdap" + git -C SwiftShader config submodule."third_party/googletest".url "$srcdir/googletest" + git -C SwiftShader config submodule."third_party/json".url "$srcdir/json" + git -C SwiftShader config submodule."third_party/libbacktrace/src".url "$srcdir/libbacktrace" + git -C SwiftShader config submodule."third_party/PowerVR_Examples".url "$srcdir/Native_SDK" + git -C SwiftShader config submodule."third_party/benchmark".url "$srcdir/benchmark" + git -C SwiftShader config submodule."third_party/glslang".url "$srcdir/glslang" + # this repo is not publicly accessible so we won't fetch it + git -C SwiftShader config submodule."third_party/git-hooks".update none + git -C SwiftShader config submodule."third_party/llvm-project".update none + git -C SwiftShader -c protocol.file.allow=always submodule update + + cmake \ + -G Ninja \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -D SWIFTSHADER_WARNINGS_AS_ERRORS=off \ + -S SwiftShader -B build + + ninja -C build + mkdir /tmp/swiftshader + mv build/libvk_swiftshader.so /tmp/swiftshader + + - name: Upload libraries + uses: actions/upload-artifact@v2 + with: + name: swiftshader_${{matrix.arch}} + path: /tmp/swiftshader \ No newline at end of file