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.

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

Release 10 2 0 #118

Merged
merged 6 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 10 additions & 3 deletions .github/workflows/build-linux-pack-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ 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:
Expand All @@ -27,8 +34,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 }}
13 changes: 7 additions & 6 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: [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
Expand Down Expand Up @@ -59,9 +59,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [22.04, 20.04]
os: ['debian: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
Expand All @@ -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)
Expand All @@ -103,9 +104,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: Put OS info on the environment
run: |
Expand Down
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ repos:
# Exclude conda's meta.yaml because
# - It crashes with jinja2 definitions (ex. "{% my_var = 1 %}")
# - It doesn't support the preprocessing selectors (ex. "[not win]")
exclude: packaging/conda/meta.yaml
# Exclude pack-debian.yml because it doesn't support quoted strings in arrays
exclude: (packaging/conda/meta.yaml|workflows/pack-debian.yml)
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
hooks:
Expand Down
27 changes: 27 additions & 0 deletions packaging/dockerfiles/Dockerfile.debian10
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM debian:10
LABEL maintainer="[email protected]"
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
27 changes: 27 additions & 0 deletions packaging/dockerfiles/Dockerfile.debian11
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM debian:11
LABEL maintainer="[email protected]"
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