From 84ea08d7d359a7ad4538a6de200adbdf73368d55 Mon Sep 17 00:00:00 2001 From: Felipe Olmos <92923444+folmos-at-orange@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:39:18 +0100 Subject: [PATCH 1/5] Bump source version to 10.2.0 --- src/Learning/KWUtils/KWKhiopsVersion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Learning/KWUtils/KWKhiopsVersion.h b/src/Learning/KWUtils/KWKhiopsVersion.h index 6aeba98c3..fd13313c3 100644 --- a/src/Learning/KWUtils/KWKhiopsVersion.h +++ b/src/Learning/KWUtils/KWKhiopsVersion.h @@ -10,7 +10,7 @@ // dans le TaskManager de Windows (par exemple) // Version de Khiops -#define KHIOPS_VERSION str(10.1.5) +#define KHIOPS_VERSION str(10.2.0) // Copyright #define KHIOPS_COPYRIGHT_LABEL str((c)2023 Orange - All rights reserved.) From ebe934e2c1d565d81d3bf0343fd7202fd34db352 Mon Sep 17 00:00:00 2001 From: Stephane Gouache Date: Fri, 8 Dec 2023 12:24:08 +0100 Subject: [PATCH 2/5] Add debian packaging --- .../workflows/build-linux-pack-containers.yml | 6 ++--- .github/workflows/pack-debian.yml | 10 +++---- packaging/dockerfiles/Dockerfile.debian10 | 27 +++++++++++++++++++ packaging/dockerfiles/Dockerfile.debian11 | 27 +++++++++++++++++++ 4 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 packaging/dockerfiles/Dockerfile.debian10 create mode 100644 packaging/dockerfiles/Dockerfile.debian11 diff --git a/.github/workflows/build-linux-pack-containers.yml b/.github/workflows/build-linux-pack-containers.yml index a52b160ea..9ad99ff0b 100644 --- a/.github/workflows/build-linux-pack-containers.yml +++ b/.github/workflows/build-linux-pack-containers.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - os: [rocky8, rocky9, ubuntu18.04, ubuntu20.04, ubuntu22.04] + os: [debian10, debian11, rocky8, rocky9, ubuntu18.04, ubuntu20.04, ubuntu22.04] permissions: packages: write # Allows writing in the container registry steps: @@ -27,8 +27,8 @@ jobs: id: docker-build uses: docker/build-push-action@v2 with: - file: ./packaging/dockerfiles/linux/Dockerfile.${{ matrix.os }} - tags: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest + file: ./packaging/dockerfiles/Dockerfile.${{ matrix.os }} + tags: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest push: true - name: Display the image digest run: echo ${{ steps.docker-build.outputs.digest }} diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index deb9dc467..0bd71b894 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -13,9 +13,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu22.04, ubuntu20.04] + os: [debian10, debian11, ubuntu22.04, ubuntu20.04] container: - image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest + image: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest steps: - name: Checkout sources uses: actions/checkout@v3 @@ -59,9 +59,9 @@ jobs: strategy: fail-fast: false matrix: - os: [22.04, 20.04] + os: [deban:10, debian:11, ubuntu:22.04, ubuntu:20.04] container: - image: ubuntu:${{ matrix.os }} + image: ${{ matrix.os }} steps: - name: Checkout sources uses: actions/checkout@v3 @@ -103,7 +103,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu22.04, ubuntu20.04] + os: [debian10, debian11, ubuntu22.04, ubuntu20.04] container: image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest steps: diff --git a/packaging/dockerfiles/Dockerfile.debian10 b/packaging/dockerfiles/Dockerfile.debian10 new file mode 100644 index 000000000..9146501d4 --- /dev/null +++ b/packaging/dockerfiles/Dockerfile.debian10 @@ -0,0 +1,27 @@ +FROM debian:10 +LABEL maintainer="khiops.team@orange.com" +LABEL description="Container with the dependencies to build and package Khiops" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN true \ + && apt-get -y update \ + && apt-get -y --no-install-recommends install \ + build-essential \ + coreutils \ + debhelper \ + default-jdk \ + devscripts \ + fakeroot \ + libmpich-dev \ + nano \ + ninja-build \ + wget \ + && rm -rf /var/lib/apt/lists/* \ + # Note: We install cmake from kitware's site to have a more recent version \ + && wget "https://github.com/Kitware/CMake/releases/download/v3.26.5/cmake-3.26.5-linux-x86_64.sh" \ + && sh cmake-3.26.5-linux-x86_64.sh --prefix=/usr/local/ --exclude-subdir \ + && rm -f cmake-3.26.5-linux-x86_64.sh \ + && apt-get -y remove wget \ + && apt-get clean \ + && true diff --git a/packaging/dockerfiles/Dockerfile.debian11 b/packaging/dockerfiles/Dockerfile.debian11 new file mode 100644 index 000000000..abb6aae13 --- /dev/null +++ b/packaging/dockerfiles/Dockerfile.debian11 @@ -0,0 +1,27 @@ +FROM debian:11 +LABEL maintainer="khiops.team@orange.com" +LABEL description="Container with the dependencies to build and package Khiops" + +ENV DEBIAN_FRONTEND=noninteractive + +RUN true \ + && apt-get -y update \ + && apt-get -y --no-install-recommends install \ + build-essential \ + coreutils \ + debhelper \ + default-jdk \ + devscripts \ + fakeroot \ + libmpich-dev \ + nano \ + ninja-build \ + wget \ + && rm -rf /var/lib/apt/lists/* \ + # Note: We install cmake from kitware's site to have a more recent version \ + && wget "https://github.com/Kitware/CMake/releases/download/v3.26.5/cmake-3.26.5-linux-x86_64.sh" \ + && sh cmake-3.26.5-linux-x86_64.sh --prefix=/usr/local/ --exclude-subdir \ + && rm -f cmake-3.26.5-linux-x86_64.sh \ + && apt-get -y remove wget \ + && apt-get clean \ + && true From 202ea4d37027598c0d1b7bf4d1df2e35442e88ce Mon Sep 17 00:00:00 2001 From: Stephane Gouache Date: Fri, 8 Dec 2023 12:29:58 +0100 Subject: [PATCH 3/5] Fix workflow syntax --- .github/workflows/pack-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index 0bd71b894..25040f82a 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -59,7 +59,7 @@ jobs: strategy: fail-fast: false matrix: - os: [deban:10, debian:11, ubuntu:22.04, ubuntu:20.04] + os: ['debian:10', 'debian:11', 'ubuntu:22.04', 'ubuntu:20.04'] container: image: ${{ matrix.os }} steps: From 47b835582471b3f53d60468a0aae02eec4a7a70c Mon Sep 17 00:00:00 2001 From: Stephane Gouache Date: Fri, 8 Dec 2023 12:53:34 +0100 Subject: [PATCH 4/5] Fix docker image path for KNI test --- .github/workflows/pack-debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index 25040f82a..6ef4cf98c 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -105,7 +105,7 @@ jobs: matrix: os: [debian10, debian11, ubuntu22.04, ubuntu20.04] container: - image: ghcr.io/khiopsml/khiops/khiopsdev-${{ matrix.os }}:latest + image: ghcr.io/${{ github.repository }}/khiopsdev-${{ matrix.os }}:latest steps: - name: Put OS info on the environment run: | From 6b248340ee5978bd02aa3e2e4bca79ce4994c985 Mon Sep 17 00:00:00 2001 From: Stephane Gouache Date: Fri, 8 Dec 2023 13:03:37 +0100 Subject: [PATCH 5/5] Debug deb installation testing --- .github/workflows/pack-debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index 6ef4cf98c..c5756cb36 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -82,6 +82,7 @@ jobs: apt-get -f install -y - name: Check Khiops core installation run: | + khiops-env --env khiops -v khiops_coclustering -v - name: Install Khiops Desktop (with java)