From fda9f77b9ce87113de71ebc51b4efc47da92029d Mon Sep 17 00:00:00 2001 From: bruno Date: Mon, 25 Mar 2024 11:35:07 +0100 Subject: [PATCH 1/3] Update whatsnew.txt --- packaging/common/khiops/WHATSNEW.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packaging/common/khiops/WHATSNEW.txt b/packaging/common/khiops/WHATSNEW.txt index 97fc455c6..92d69728c 100644 --- a/packaging/common/khiops/WHATSNEW.txt +++ b/packaging/common/khiops/WHATSNEW.txt @@ -2,6 +2,14 @@ Release Notes for Khiops 10 Version Series ========================================== +Version 10.2.1 +============== +Bug fix: +- Fix a bug that appears when reading temporary files in multi-machines mode. + +Minor improvments: +- improve java management in linux packages + Version 10.2.0 ============== **Announcement**: This is a special release marking the open-sourcing of the Khiops AutoML suite. From 35b6880299081e5a071c18597519ee181ee9bb74 Mon Sep 17 00:00:00 2001 From: Felipe Olmos <92923444+folmos-at-orange@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:25:32 +0100 Subject: [PATCH 2/3] Fix package renaming in CI The release part of the packaging workflows contain a renaming step to make sure it coincides with the tag. This patch makes sure that this is only made when the source version is different from the tag. --- .github/workflows/pack-debian.yml | 5 ++++- .github/workflows/pack-nsis.yml | 8 +++++++- .github/workflows/pack-rpm.yml | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index ab72d2dd6..c3fd21c8b 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -166,7 +166,10 @@ jobs: for PKG_FILE in *.deb do NEW_PKG_FILE=$(echo $PKG_FILE | sed "s/_${SOURCE_VERSION}-/_${{ github.ref_name }}-/") - mv $PKG_FILE $NEW_PKG_FILE + if [[ "$PKG_FILE" != "$NEW_PKG_FILE" ]] + then + mv $PKG_FILE $NEW_PKG_FILE + fi done - name: Upload packages to the release uses: ncipollo/release-action@v1.14.0 diff --git a/.github/workflows/pack-nsis.yml b/.github/workflows/pack-nsis.yml index 1134855fa..741827033 100644 --- a/.github/workflows/pack-nsis.yml +++ b/.github/workflows/pack-nsis.yml @@ -158,10 +158,16 @@ jobs: name: KNI - name: Rename packages with tag version run: | + # Build the package file names SOURCE_VERSION="${{ needs.build.outputs.khiops-version }}" PKG_FILE=$(ls *-setup.exe) NEW_PKG_FILE=$(echo $PKG_FILE | sed "s/-${SOURCE_VERSION}-/-${{ github.ref_name }}-/") - mv $PKG_FILE $NEW_PKG_FILE + + # Rename to the tag version only if it is not coherent with the source version + if [[ "$PKG_FILE" != "$NEW_PKG_FILE" ]] + then + mv $PKG_FILE $NEW_PKG_FILE + fi - name: Upload NSIS installer and KNI to the release uses: ncipollo/release-action@v1.14.0 with: diff --git a/.github/workflows/pack-rpm.yml b/.github/workflows/pack-rpm.yml index 6c546f260..65a4376bf 100644 --- a/.github/workflows/pack-rpm.yml +++ b/.github/workflows/pack-rpm.yml @@ -156,11 +156,15 @@ jobs: merge-multiple: true - name: Rename packages with tag version run: | + # Renames the packge only if the source version differs from the tag SOURCE_VERSION=$(./scripts/khiops-version) for PKG_FILE in *.rpm do NEW_PKG_FILE=$(echo $PKG_FILE | sed "s/-${SOURCE_VERSION}-/-${{ github.ref_name }}-/") - mv $PKG_FILE $NEW_PKG_FILE + if [[ "$PKG_FILE" != "$NEW_PKG_FILE" ]] + then + mv $PKG_FILE $NEW_PKG_FILE + fi done - name: Upload packages to the release uses: ncipollo/release-action@v1.14.0 From 2f5eb1b1588b49986ba5240f29c7a74cad9138e9 Mon Sep 17 00:00:00 2001 From: Felipe Olmos <92923444+folmos-at-orange@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:04:55 +0100 Subject: [PATCH 3/3] Allow CI failure for unsupported Debian versions We use `continue-on-error` for certain steps of the testing packages for Debian 11 and 12. This way the CI is green even though in these OS the packages fail on basic tests. --- .github/workflows/pack-debian.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pack-debian.yml b/.github/workflows/pack-debian.yml index c3fd21c8b..2a67e38ad 100644 --- a/.github/workflows/pack-debian.yml +++ b/.github/workflows/pack-debian.yml @@ -65,7 +65,6 @@ jobs: test: needs: build runs-on: ubuntu-latest - continue-on-error: true defaults: run: shell: bash @@ -94,6 +93,7 @@ jobs: dpkg -i ./artifacts/khiops-core* || true apt-get -f install -y - name: Check Khiops core installation + continue-on-error: ${{ matrix.os == 'debian:11' }} run: | khiops-env --env khiops -v @@ -103,10 +103,12 @@ jobs: dpkg -i ./khiops_* || true apt-get -f install -y - name: Check Khiops installation + continue-on-error: ${{ matrix.os == 'debian:11' }} run: | khiops -v khiops_coclustering -v - name: Test Khiops installation + continue-on-error: ${{ matrix.os == 'debian:11' || matrix.os == 'debian:12' }} uses: ./.github/actions/test-khiops-install test-kni: needs: build