Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

120 jar files are not present in the ubuntu debian khiops desktop packages #121

Merged
merged 4 commits into from
Jan 12, 2024
Merged

120 jar files are not present in the ubuntu debian khiops desktop packages #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d88b31a
Path to container image must be lowercase
popescu-v Jan 12, 2024
a473f2f
Do not build Debian 11 package, as MPI support is broken
popescu-v Jan 12, 2024
65705ed
Add Khiops JAR files to the Khiops desktop Linux packages.
popescu-v Jan 11, 2024
586fc94
Exclude Unspecified component package from being built
popescu-v Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build-linux-pack-containers.yml
View file
Open in desktop
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
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't we make the same trick for as in build-linux-pack-containers.yml for GH_REPOSITORY ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see how, because in that other case, I had added a preliminary stage doing this. Whereas here, we would need this variable from the outset (before any job stage is executed).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let's leave it like that for the moment.

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
View file
Open in desktop
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
View file
Open in desktop
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