Skip to content

Commit

Permalink
fix: don't include top level dir in zip archive
Browse files Browse the repository at this point in the history
move the archive to expected name instead of double zipping it.
  • Loading branch information
diogomatsubara committed Oct 30, 2024
1 parent 4765634 commit c572df5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,8 @@ jobs:
- name: Zip standalone archives
shell: bash
run: |
zip_cmd="zip -9 -j"
if [[ ${{ contains(matrix.build.target, 'windows') }} == true ]]; then
zip_cmd="7z -mx9 a"
fi
${zip_cmd} zenohc-${{ inputs.version || '0.0.0' }}-${{ matrix.build.target }}-standalone.zip ./build/packages/*.zip
zip_filename=$(readlink -f ./build/packages/*.zip)
mv ${zip_filename} zenoh-c-${{ inputs.version || '0.0.0' }}-${{ matrix.build.target }}-standalone.zip
- name: Zip deb/rpm archives
shell: bash
Expand All @@ -193,7 +190,7 @@ jobs:
with:
# Publish the artifact with zenoh-c (repo name) so it can be used by homebrew action
name: zenoh-c-${{ inputs.version || '0.0.0' }}-${{ matrix.build.target }}-standalone.zip
path: zenohc-${{ inputs.version || '0.0.0' }}-${{ matrix.build.target }}-standalone.zip
path: zenoh-c-${{ inputs.version || '0.0.0' }}-${{ matrix.build.target }}-standalone.zip

- name: Upload DEB archive
if: ${{ contains(matrix.build.target, 'linux') }}
Expand Down
1 change: 1 addition & 0 deletions install/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ set(CPACK_COMPONENT_HEADERS_GROUP "dev")
set(CPACK_COMPONENT_DEV_GROUP "dev")
set(CPACK_COMPONENT_HEADERS_DEPENDS lib)
set(CPACK_COMPONENT_DEV_DEPENDS lib)
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)

set(CPACK_GENERATOR ZIP)
set(CPACK_CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
Expand Down

0 comments on commit c572df5

Please sign in to comment.