Fix release package name (#110)

* Fix release package name * Add release dir
ohto-ai · Apr 19, 2023 · ee273a2 · ee273a2
1 parent fa32704
commit ee273a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci_release.yaml b/.github/workflows/ci_release.yaml
@@ -43,7 +43,7 @@ jobs:
           cmake --build build --config Release --target package -j8
         else
           package_path=$bin_path
-          asset_name="${{ steps.build.outputs.package_name }}_${{ matrix.os }}_${{ github.ref_name }}"
+          asset_name="$bin_name_${{ matrix.os }}_${{ github.ref_name }}"
         fi
 
         echo "package_name=$bin_name" >> $GITHUB_OUTPUT

diff --git a/scripts/env.sh.in b/scripts/env.sh.in
@@ -6,6 +6,6 @@ bin_version="@PROJECT_VERSION@"
 bin_description="@DESCRIPTION@"
 commit_hash="@GIT_COMMIT_HASH@"
 bin_file="@PROJECT_NAME@@BINARY_SUFFIX@"
-bin_path="@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@@BINARY_SUFFIX@"
+bin_path="@CMAKE_CURRENT_BINARY_DIR@/@RELEASE_DIR@@PROJECT_NAME@@BINARY_SUFFIX@"
 deb_file="@PROJECT_NAME@-@PROJECT_VERSION@-Linux.deb"
-deb_path="@CMAKE_CURRENT_BINARY_DIR@/@PROJECT_NAME@-@PROJECT_VERSION@-Linux.deb"
+deb_path="@CMAKE_BINARY_DIR@/@PROJECT_NAME@-@PROJECT_VERSION@-Linux.deb"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,8 +8,10 @@ set(EMAIL "zhu.thatboy@outlook.com")
 set(DESCRIPTION "A webhook server")
 if(WIN32)
     set(BINARY_SUFFIX ".exe")
+    set(RELEASE_DIR "Release/")
 else()
     set(BINARY_SUFFIX "")
+    set(RELEASE_DIR "")
 endif()
 
 configure_file(