Skip to content

Commit

Permalink
v1.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
yonielwest committed Feb 23, 2024
1 parent 0893fb8 commit 662873e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/cmake-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,14 +141,16 @@ jobs:
run: ./gradlew :gpupixel:assemble

- name: Create zip
working-directory: ${{github.workspace}}/src/android/java/gpupixel/build/outputs/aar
run: zip -r gpupixel_android_arm64_v8a_aar.zip .
working-directory: ${{github.workspace}}/output
run: |
cp -r ${{github.workspace}}/src/android/java/gpupixel/build/outputs/aar ${{github.workspace}}/output/library/android
zip -r gpupixel_android_arm64_v8a_aar.zip .
- name: Upload Android Artifact
uses: actions/upload-artifact@v4
with:
name: gpupixel_android_arm64_v8a_aar
path: ${{github.workspace}}/src/android/java/gpupixel/build/outputs/aar/gpupixel_android_arm64_v8a_aar.zip
path: ${{github.workspace}}/output/gpupixel_android_arm64_v8a_aar.zip

# Deployment job
deploy:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GPUPixel Version: v1.2.3
GPUPixel Version: v1.2.4
## What's New

1. Add ci script for building libs and demo.
1. opt cmake and update demo
8 changes: 0 additions & 8 deletions src/lib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,6 @@ else()
${VNN_LIBS} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vnn
)
endif()

if(${CURRENT_OS} STREQUAL "android")
set(ANDROID_AAR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android/java/gpupixel/build/outputs/aar)
ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${ANDROID_AAR_DIR} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
)
endif()
ENDMACRO()

EXPORT_INCLUDE()

0 comments on commit 662873e

Please sign in to comment.