Skip to content

Commit

Permalink
Merge pull request #121 from KhiopsML/120-jar-files-are-not-present-i…
Browse files Browse the repository at this point in the history
…n-the-ubuntu-debian-khiops-desktop-packages

120 jar files are not present in the ubuntu debian khiops desktop packages
  • Loading branch information
popescu-v authored Jan 12, 2024
2 parents cfbf4e1 + 586fc94 commit a767b14
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build-linux-pack-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Downcase GitHub repository
run: echo "GH_REPOSITORY=${GITHUB_REPOSITORY,,}" >> "${GITHUB_ENV}"
- name: Build the image and push it to the registry
id: docker-build
uses: docker/build-push-action@v2
with:
file: ./packaging/dockerfiles/Dockerfile.${{ matrix.os }}
tags: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest
tags: ghcr.io/${{ env.GH_REPOSITORY }}/khiopsdev-${{ matrix.os }}:latest
push: true
- name: Display the image digest
run: echo ${{ steps.docker-build.outputs.digest }}
10 changes: 5 additions & 5 deletions .github/workflows/pack-debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [debian10, debian11, ubuntu22.04, ubuntu20.04]
os: [debian10, ubuntu22.04, ubuntu20.04]
container:
image: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest
image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['debian:10', 'debian:11', 'ubuntu:22.04', 'ubuntu:20.04']
os: ['debian:10', 'ubuntu:22.04', 'ubuntu:20.04']
container:
image: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -104,9 +104,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [debian10, debian11, ubuntu22.04, ubuntu20.04]
os: [debian10, ubuntu22.04, ubuntu20.04]
container:
image: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest
image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest
steps:
- name: Put OS info on the environment
run: |
Expand Down
9 changes: 7 additions & 2 deletions packaging/install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ install(
install(
FILES ${TMP_DIR}/kni.README.txt
DESTINATION ${DOC_DIR}
RENAME README.txt
COMPONENT KNI)
COMPONENT KNI
RENAME README.txt)

# Copy KNI c++ files to temporary directory before to add main functions
configure_file(${PROJECT_SOURCE_DIR}/src/Learning/KNITransfer/KNIRecodeFile.cpp ${TMP_DIR}/KNIRecodeFile.c COPYONLY)
Expand Down Expand Up @@ -115,3 +115,8 @@ install(
${PROJECT_SOURCE_DIR}/packaging/linux/common/khiops-coclustering.desktop
DESTINATION usr/share/applications
COMPONENT KHIOPS)

install(
FILES ${CMAKE_BINARY_DIR}/jars/norm.jar ${CMAKE_BINARY_DIR}/jars/khiops.jar
DESTINATION usr/share/khiops
COMPONENT KHIOPS)
3 changes: 3 additions & 0 deletions packaging/packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ set(CPACK_RPM_KHIOPS_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/packaging/l
set(CPACK_RPM_KNI_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/packaging/linux/redhat/kni.post")
set(CPACK_RPM_KNI_POSTUN_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/packaging/linux/redhat/kni.postun")

get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
list(REMOVE_ITEM CPACK_COMPONENTS_ALL "Unspecified")

include(CPack)

# Check if all files are installed within a component. If not, these files will be in the package
Expand Down

0 comments on commit a767b14

Please sign in to comment.