From 26b8f04fc4e448cbeff89fb8ec138b20db7d4b82 Mon Sep 17 00:00:00 2001 From: Eugene Gershnik Date: Thu, 2 Nov 2023 10:33:39 -0700 Subject: [PATCH] Github publishing #2 --- .github/workflows/publish.yml | 4 ++-- CMakeLists.txt | 2 +- jnigen/build.gradle.kts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5db7ee6..c34e525 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,5 +34,5 @@ jobs: name: ${{ env.RELEASE_NAME }} body: ...edit me... files: | - SimpleJNI-${{ env.RELEASE_NAME }}-cpp-only.zip - SimpleJNI-${{ env.RELEASE_NAME }}-jnigen.zip \ No newline at end of file + build/SimpleJNI-${{ env.RELEASE_NAME }}-cpp-only.zip + build/SimpleJNI-${{ env.RELEASE_NAME }}-jnigen.zip \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index f842090..b84a35b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,7 +112,7 @@ PUBLIC ) -if (PROJECT_IS_TOP_LEVEL) +if (PROJECT_IS_TOP_LEVEL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests) add_subdirectory(tests) diff --git a/jnigen/build.gradle.kts b/jnigen/build.gradle.kts index 544b45d..451c33b 100644 --- a/jnigen/build.gradle.kts +++ b/jnigen/build.gradle.kts @@ -79,9 +79,9 @@ tasks.register("bundleCpp") { into("inc") } from("../CMakeLists.txt", - "../COPYRIGHT.txt", - "../LICENSE.txt", - "../NOTICE.txt", + "../VERSION", + "../LICENSE", + "../NOTICE", "../README.md") archiveFileName.set("SimpleJNI-${project.version}-cpp-only.zip")