From 1f469a45a014dfeb9896dbea268f89b529eb9caa Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 10 Oct 2023 15:59:39 +0200 Subject: [PATCH 001/118] Test_centos7_release_7 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 9ae4a2e68..0abae4625 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -28,10 +28,11 @@ jobs: uses: actions/checkout@v1 - name: Download Boost-release - uses: pozetroninc/github-action-get-latest-release@master + uses: dsaltares/fetch-gh-release-asset@master with: - owner: ARnDOSrte - repo: Boost + repo: 'ARnDOSrte/Boost' + file: 'boost_1_73_0.zip' + target: 'boost_1_73_0.zip' token: ${{ secrets.TEST_TOKEN_RELEASE }} - name: Unzip Boost From 1f31e267c623dbad1ce986f839a7a11c0fc4c2d3 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 10 Oct 2023 17:28:35 +0200 Subject: [PATCH 002/118] Test_centos7_release_8 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 0abae4625..c724727eb 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -53,7 +53,7 @@ jobs: - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 782de5037a4aad838e4b89d6df45926d7bef8db0 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 09:21:40 +0200 Subject: [PATCH 003/118] Test_centos7_release_9 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index c724727eb..bf4712c5b 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -53,7 +53,7 @@ jobs: - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From c33bbf0e97248b1454a2302c94aae38d35ab39e2 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 10:42:13 +0200 Subject: [PATCH 004/118] Test_centos7_release_10 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index bf4712c5b..ba36e13d5 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -52,8 +52,11 @@ jobs: - name: Configure CMake run: | + pwd + echo $GITHUB_WORKSPACE + ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBOOST_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 65f2f96d0afd92718954fa5b12dd7524c717d7b1 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 10:54:44 +0200 Subject: [PATCH 005/118] Test_centos7_release_11 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index ba36e13d5..875e19cc3 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -55,6 +55,13 @@ jobs: pwd echo $GITHUB_WORKSPACE ls + cd .__w + echo "on part dans __w" + ls + cd ../.. + echo "On part deux crans en arrière" + ls + cd powsybl-metrix source /opt/rh/devtoolset-9/enable cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux From 5f8dab39166a47e6c7e06581e9713c8daa181960 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 11:00:02 +0200 Subject: [PATCH 006/118] Test_centos7_release_12 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 875e19cc3..78f63a989 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -55,7 +55,7 @@ jobs: pwd echo $GITHUB_WORKSPACE ls - cd .__w + cd __w echo "on part dans __w" ls cd ../.. From 5dba23ea56990db70ed47166878d6efe866cf299 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 11:30:20 +0200 Subject: [PATCH 007/118] Test_centos7_release_13 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 78f63a989..7720ec942 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -58,12 +58,15 @@ jobs: cd __w echo "on part dans __w" ls + cd Boost + echo "On part dans __w/Boost" + ls cd ../.. echo "On part deux crans en arrière" ls cd powsybl-metrix source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=/_w/powsybl-metrix/powsybl-metrix/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From eed9ab62a74f418980a83180b2285bdb850cb80e Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 11:36:59 +0200 Subject: [PATCH 008/118] Test_centos7_release_14 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 7720ec942..bacc108bd 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -58,13 +58,12 @@ jobs: cd __w echo "on part dans __w" ls - cd Boost + cd Boost/Boost echo "On part dans __w/Boost" ls - cd ../.. + cd ../../../ echo "On part deux crans en arrière" ls - cd powsybl-metrix source /opt/rh/devtoolset-9/enable cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux From 7cf62d93a42b6208b4f61d5b98a4799d3c4dd5cc Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 11:44:18 +0200 Subject: [PATCH 009/118] Test_centos7_release_15 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index bacc108bd..be7a0a8df 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -58,14 +58,14 @@ jobs: cd __w echo "on part dans __w" ls - cd Boost/Boost - echo "On part dans __w/Boost" + cd Boost/Boost/boost_1_73_0 + echo "On part dans __w/Boost/Boost/boost_1_73_0" ls - cd ../../../ + cd ../../../.. echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 3717ebdfd75fe8901441dca31e162be90a1dcdf4 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 11:58:37 +0200 Subject: [PATCH 010/118] Test_centos7_release_16 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index be7a0a8df..1958da270 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs/headers -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From f07a528072a67e00c43764e4d8368c2be4ab97a8 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 12:17:41 +0200 Subject: [PATCH 011/118] Test_centos7_release_17 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 1958da270..c476b94e8 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs/headers -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_PROGRAM_OPTIONS=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 2db951673f6def9c72133a17093fac872a9198bf Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:00:21 +0200 Subject: [PATCH 012/118] Test_centos7_release_18 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index c476b94e8..127186098 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_PROGRAM_OPTIONS=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_PROGRAM_OPTIONS=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From ba3fbcde13621f5c72d08b2062cc0307625cea1c Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:06:20 +0200 Subject: [PATCH 013/118] Test_centos7_release_19 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 127186098..e55072bb7 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_PROGRAM_OPTIONS=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 872953a4c06c2302eca1b240061778c27b1c2528 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:07:25 +0200 Subject: [PATCH 014/118] Test_centos7_release_20 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index e55072bb7..7135856c3 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From cea002086604d1f5e75ad5eb9978d40ab77da8f3 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:12:52 +0200 Subject: [PATCH 015/118] Test_centos7_release_21 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 7135856c3..7dc450c41 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBoost_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From ab714cb835c5aa1675bf28b67c26395821258fce Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:13:37 +0200 Subject: [PATCH 016/118] Test_centos7_release_22 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 7dc450c41..9cf88583f 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 9d75e92b448d37f65ebdc7681b685233274b9db3 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:18:51 +0200 Subject: [PATCH 017/118] Test_centos7_release_23 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 9cf88583f..5bbda7002 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_USE_STATIC_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From bfb94619fe806a25ab8b3108a817b573f077d471 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 11 Oct 2023 14:45:38 +0200 Subject: [PATCH 018/118] Test_centos7_release_24 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 5bbda7002..6815a578f 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_USE_STATIC_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost/libs -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From c7b52c38ae003bddc4f758d5e6cc7536bc995e83 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 09:46:50 +0200 Subject: [PATCH 019/118] Test_centos7_release_25 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 6815a578f..ace3dff82 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost/libs -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 0d2812c14ea1f3302db2add690be8e2083e5e72c Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 09:48:02 +0200 Subject: [PATCH 020/118] Test_centos7_release_26 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index ace3dff82..e5d07bb04 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -65,7 +65,7 @@ jobs: echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/libs -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 9c9cd6ecde65e2d49616b111d399fd68eb59960a Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 10:55:43 +0200 Subject: [PATCH 021/118] Test_centos7_release_27 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index e5d07bb04..02a9bed20 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -58,14 +58,14 @@ jobs: cd __w echo "on part dans __w" ls - cd Boost/Boost/boost_1_73_0 - echo "On part dans __w/Boost/Boost/boost_1_73_0" + cd Boost/Boost/boost_1_73_0/installBoost + echo "On part dans __w/Boost/Boost/boost_1_73_0/installBoost" ls - cd ../../../.. + cd ../../../../ echo "On part deux crans en arrière" ls source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0 -DBOOST_LIBRARYDIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/boost -DBOOST_USE_STATIC_LIBS=ON -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 From 3a0cf580d6273797028c46bba6c87c09d0f240d7 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 11:23:43 +0200 Subject: [PATCH 022/118] Test_centos7_release_28 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 17 +---------------- .github/workflows/qa_pr_cpp_centos7.yml | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 02a9bed20..bd04862dc 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -36,10 +36,7 @@ jobs: token: ${{ secrets.TEST_TOKEN_RELEASE }} - name: Unzip Boost - run: | - pwd - ls - unzip boost_1_73_0.zip + run: unzip boost_1_73_0.zip - name: Configure 3rd parties run: | @@ -52,18 +49,6 @@ jobs: - name: Configure CMake run: | - pwd - echo $GITHUB_WORKSPACE - ls - cd __w - echo "on part dans __w" - ls - cd Boost/Boost/boost_1_73_0/installBoost - echo "On part dans __w/Boost/Boost/boost_1_73_0/installBoost" - ls - cd ../../../../ - echo "On part deux crans en arrière" - ls source /opt/rh/devtoolset-9/enable cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 1967f9f77..098008b1d 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -95,15 +95,16 @@ jobs: env: SONAR_SCANNER_VERSION: 3.3.0.1492 - - name: Install Boost - run: | - source /opt/rh/devtoolset-9/enable - wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz - tar -xzvf ./boost_1_73_0.tar.gz - cd boost_1_73_0 - ./bootstrap.sh --prefix=/usr/local - ./b2 install --without-python -j 5 - cd .. + - name: Download Boost-release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'ARnDOSrte/Boost' + file: 'boost_1_73_0.zip' + target: 'boost_1_73_0.zip' + token: ${{ secrets.TEST_TOKEN_RELEASE }} + + - name: Unzip Boost + run: unzip boost_1_73_0.zip - name: Checkout sources uses: actions/checkout@v1 @@ -124,6 +125,7 @@ jobs: source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug + -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install @@ -132,6 +134,7 @@ jobs: run: > cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug + -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install From 21f56c1915d11f57f154ab4fe20bf05d7f2f7741 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 11:48:20 +0200 Subject: [PATCH 023/118] Test_centos7_release_29 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 098008b1d..74a01bacc 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -70,6 +70,7 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 + yum install -y python-pip - name: Install Java 11 uses: actions/setup-java@v1 From f88cf391fd950066822b0da62363b6a0ed35a4cb Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 14:00:47 +0200 Subject: [PATCH 024/118] Test_centos7_release_30 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 74a01bacc..a53029ee8 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -78,7 +78,7 @@ jobs: java-version: 11 - name: Install gcovr - run: yum pip install gcovr + run: pip install gcovr - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} From ee3cf045b8e2003a1ae5f8a9d33fb47b8b4b48aa Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 12 Oct 2023 14:06:06 +0200 Subject: [PATCH 025/118] Test_centos7_release_31 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 3 ++- .gitignore | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index a53029ee8..f14368b03 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -71,6 +71,7 @@ jobs: yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 yum install -y python-pip + pip install --upgrade pip - name: Install Java 11 uses: actions/setup-java@v1 @@ -78,7 +79,7 @@ jobs: java-version: 11 - name: Install gcovr - run: pip install gcovr + run: sudo pip install gcovr - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} diff --git a/.gitignore b/.gitignore index 53ece5874..9e7378b01 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # CMake projects /build/ +/buildDebug/ /thirdparty/build/ # IntelliJ From decd18774f4e41188abb8fb722821393e06112a6 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 09:53:29 +0200 Subject: [PATCH 026/118] Test_centos7_release_32 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 116 ++++++++++++------------ .github/workflows/qa_pr_cpp_ubuntu.yml | 56 ++++++------ 2 files changed, 87 insertions(+), 85 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f14368b03..9e431f599 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -19,15 +19,16 @@ jobs: yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - - name: Install Boost - run: | - source /opt/rh/devtoolset-9/enable - wget https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.gz - tar -xzvf ./boost_1_73_0.tar.gz - cd boost_1_73_0 - ./bootstrap.sh --prefix=/usr/local - ./b2 install --without-python -j 5 - cd .. + - name: Download Boost-release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'ARnDOSrte/Boost' + file: 'boost_1_73_0.zip' + target: 'boost_1_73_0.zip' + token: ${{ secrets.TEST_TOKEN_RELEASE }} + + - name: Unzip Boost + run: unzip boost_1_73_0.zip - name: Install clang-tidy run: | @@ -51,6 +52,7 @@ jobs: source /opt/rh/devtoolset-9/enable cmake -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug + -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - name: Clang Tidy @@ -81,19 +83,19 @@ jobs: - name: Install gcovr run: sudo pip install gcovr - - name: Install Sonar wrapper - working-directory: ${{ runner.workspace }} - run: | - wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - unzip build-wrapper-linux-x86.zip - - - name: Install Sonar scanner - working-directory: ${{ runner.workspace }} - run: | - wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar - rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + # - name: Install Sonar wrapper + # working-directory: ${{ runner.workspace }} + # run: | + # wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip + # unzip build-wrapper-linux-x86.zip + + # - name: Install Sonar scanner + # working-directory: ${{ runner.workspace }} + # run: | + # wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + # unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + # ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar + # rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip env: SONAR_SCANNER_VERSION: 3.3.0.1492 @@ -149,8 +151,8 @@ jobs: - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure - - name: Code coverage - run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage + # - name: Code coverage + # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage # - name: Sonarcloud # working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator @@ -165,7 +167,7 @@ jobs: if: github.event_name == 'release' id: metrix-install run: | - ARCHIVE_NAME="metrix-simulator.zip" + ARCHIVE_NAME="metrix-simulator-centos7.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-linux/install/bin/metrix-simulator echo "::set-output name=archive_name::$ARCHIVE_NAME" @@ -178,36 +180,36 @@ jobs: name: ${{ steps.metrix-install.outputs.archive_name }} path: ${{ steps.metrix-install.outputs.archive_path }} - publish_asset: - name: Publish release assets - needs: qa - runs-on: ubuntu-latest - if: github.event_name == 'release' - steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: metrix-simulator.zip - path: ./ - - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false + # publish_asset: + # name: Publish release assets + # needs: qa + # runs-on: ubuntu-latest + # if: github.event_name == 'release' + # steps: + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: metrix-simulator.zip + # path: ./ + + # - name: Create Release + # id: create_release + # uses: actions/create-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} + # with: + # tag_name: ${{ github.ref }} + # release_name: Release ${{ github.ref }} + # draft: false + # prerelease: false - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: metrix-simulator.zip - asset_name: metrix-simulator.zip - asset_content_type: application/zip + # - name: Upload Release Asset + # id: upload-release-asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} + # with: + # upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + # asset_path: metrix-simulator.zip + # asset_name: metrix-simulator.zip + # asset_content_type: application/zip diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 7c19aee48..09e1722a2 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -132,7 +132,7 @@ jobs: if: github.event_name == 'release' id: metrix-install run: | - ARCHIVE_NAME="metrix-simulator.zip" + ARCHIVE_NAME="metrix-simulator-ubuntu.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build/install/bin/metrix-simulator echo "::set-output name=archive_name::$ARCHIVE_NAME" @@ -145,31 +145,31 @@ jobs: name: ${{ steps.metrix-install.outputs.archive_name }} path: ${{ steps.metrix-install.outputs.archive_path }} - publish_asset: - name: Publish release assets - needs: qa - runs-on: ubuntu-latest - if: github.event_name == 'release' - steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: metrix-simulator.zip - path: ./ - - - name: Get release - id: get_release - uses: bruceadams/get-release@v1.3.2 - env: - GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} + # publish_asset: + # name: Publish release assets + # needs: qa + # runs-on: ubuntu-latest + # if: github.event_name == 'release' + # steps: + # - name: Download artifacts + # uses: actions/download-artifact@v3 + # with: + # name: metrix-simulator.zip + # path: ./ + + # - name: Get release + # id: get_release + # uses: bruceadams/get-release@v1.3.2 + # env: + # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - with: - upload_url: ${{ steps.get_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: metrix-simulator.zip - asset_name: metrix-simulator.zip - asset_content_type: application/zip + # - name: Upload Release Asset + # id: upload-release-asset + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} + # with: + # upload_url: ${{ steps.get_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + # asset_path: metrix-simulator.zip + # asset_name: metrix-simulator.zip + # asset_content_type: application/zip From 1fd5c63568b01fade0b0b5af88f9bf31ba127fbe Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 09:57:48 +0200 Subject: [PATCH 027/118] Test_centos7_release_33 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 9e431f599..c46667680 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -72,8 +72,8 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - yum install -y python-pip - pip install --upgrade pip + # yum install -y python-pip + # pip install --upgrade pip - name: Install Java 11 uses: actions/setup-java@v1 From 3e65463ddd42b380ff1c80132e19de2a3f8e98ec Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:05:06 +0200 Subject: [PATCH 028/118] Test_centos7_release_34 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 8 ++++---- .github/workflows/qa_pr_cpp_ubuntu.yml | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index c46667680..f575183cf 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -80,8 +80,8 @@ jobs: with: java-version: 11 - - name: Install gcovr - run: sudo pip install gcovr + # - name: Install gcovr + # run: sudo pip install gcovr # - name: Install Sonar wrapper # working-directory: ${{ runner.workspace }} @@ -96,8 +96,8 @@ jobs: # unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip # ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar # rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - env: - SONAR_SCANNER_VERSION: 3.3.0.1492 + # env: + # SONAR_SCANNER_VERSION: 3.3.0.1492 - name: Download Boost-release uses: dsaltares/fetch-gh-release-asset@master diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 09e1722a2..4b08d173a 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -1,4 +1,4 @@ -name: QA-PR-CPP +name: QA-PR-CPP-UBUNTU on: pull_request: @@ -119,14 +119,14 @@ jobs: if: github.event_name == 'release' run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - - name: Sonarcloud - working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: > - ${{ runner.workspace }}/sonar/bin/sonar-scanner - -Dsonar.host.url=https://sonarcloud.io + # - name: Sonarcloud + # working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + # run: > + # ${{ runner.workspace }}/sonar/bin/sonar-scanner + # -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' From 1e23de76fdb0209131a394b4122c9ce3f1cc23bc Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:19:05 +0200 Subject: [PATCH 029/118] Test_centos7_release_35 Signed-off-by: arnaud --- .../workflows/publish_artifact_centos7.yml | 76 +++++++++++++++++++ .github/workflows/qa_pr_cpp_centos7.yml | 6 +- 2 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/publish_artifact_centos7.yml diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml new file mode 100644 index 000000000..942c0fcdb --- /dev/null +++ b/.github/workflows/publish_artifact_centos7.yml @@ -0,0 +1,76 @@ +name: CI-cpp-centos7 + +on: workflow_dispatch + +defaults: + run: + shell: bash + +jobs: + linux: + name: Linux + runs-on: ubuntu-latest + container: 'centos:centos7' + steps: + - name: Install Dependancies + run: | + yum update -y + yum install -y epel-release + yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils + yum install -y devtoolset-9 + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' + + - name: Checkout sources + uses: actions/checkout@v1 + + - name: Download Boost-release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'ARnDOSrte/Boost' + file: 'boost_1_73_0.zip' + target: 'boost_1_73_0.zip' + token: ${{ secrets.TEST_TOKEN_RELEASE }} + + - name: Unzip Boost + run: unzip boost_1_73_0.zip + + - name: Configure 3rd parties + run: | + source /opt/rh/devtoolset-9/enable + cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-linux/external + + - name: Build 3rd parties + run: | + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux/external --parallel 2 + + - name: Configure CMake + run: | + source /opt/rh/devtoolset-9/enable + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + + - name: Build + run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 + + - name: Tests + run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j2 --output-on-failure + + - name: Prepare Metrix install + if: github.event_name == 'release' + id: metrix-install + run: | + ARCHIVE_NAME="metrix-simulator-centos7.zip" + ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" + zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-linux/install/bin/metrix-simulator + echo "::set-output name=archive_name::$ARCHIVE_NAME" + echo "::set-output name=archive_path::$ARCHIVE_PATH" + + - name: Upload OR-Tools install artifact + if: github.event_name == 'release' + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.metrix-install.outputs.archive_name }} + path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f575183cf..234ed3089 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -99,6 +99,9 @@ jobs: # env: # SONAR_SCANNER_VERSION: 3.3.0.1492 + - name: Checkout sources + uses: actions/checkout@v1 + - name: Download Boost-release uses: dsaltares/fetch-gh-release-asset@master with: @@ -110,9 +113,6 @@ jobs: - name: Unzip Boost run: unzip boost_1_73_0.zip - - name: Checkout sources - uses: actions/checkout@v1 - - name: Configure 3rd parties run: | source /opt/rh/devtoolset-9/enable From 1bdd779dc74c71fe3510f62c8a6414552a323064 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:21:56 +0200 Subject: [PATCH 030/118] Test_centos7_release_36 Signed-off-by: arnaud --- .github/workflows/publish_artifact_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml index 942c0fcdb..125f0c4cd 100644 --- a/.github/workflows/publish_artifact_centos7.yml +++ b/.github/workflows/publish_artifact_centos7.yml @@ -1,4 +1,4 @@ -name: CI-cpp-centos7 +name: publish-on-demand-centos7 on: workflow_dispatch From 020b7ccf87270eebff3d42f233df448eb4d74593 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:35:28 +0200 Subject: [PATCH 031/118] Test_centos7_release_37 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 23 +++++- .../workflows/publish_artifact_centos7.yml | 76 ------------------- .github/workflows/qa_pr_cpp_centos7.yml | 1 - 3 files changed, 21 insertions(+), 79 deletions(-) delete mode 100644 .github/workflows/publish_artifact_centos7.yml diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index bd04862dc..734786c34 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -1,6 +1,8 @@ name: CI-cpp-centos7 -on: [push] +on: + push: + workflow_dispatch: defaults: run: @@ -56,4 +58,21 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j2 --output-on-failure \ No newline at end of file + run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j2 --output-on-failure + + - name: Prepare Metrix install + if: github.event_name == 'workflow_dispatch' + id: metrix-install + run: | + ARCHIVE_NAME="metrix-simulator-centos7.zip" + ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" + zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-linux/install/bin/metrix-simulator + echo "::set-output name=archive_name::$ARCHIVE_NAME" + echo "::set-output name=archive_path::$ARCHIVE_PATH" + + - name: Upload OR-Tools install artifact + if: github.event_name == 'workflow_dispatch' + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.metrix-install.outputs.archive_name }} + path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml deleted file mode 100644 index 125f0c4cd..000000000 --- a/.github/workflows/publish_artifact_centos7.yml +++ /dev/null @@ -1,76 +0,0 @@ -name: publish-on-demand-centos7 - -on: workflow_dispatch - -defaults: - run: - shell: bash - -jobs: - linux: - name: Linux - runs-on: ubuntu-latest - container: 'centos:centos7' - steps: - - name: Install Dependancies - run: | - yum update -y - yum install -y epel-release - yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils - yum install -y devtoolset-9 - - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.13 - with: - cmake-version: '3.22.x' - - - name: Checkout sources - uses: actions/checkout@v1 - - - name: Download Boost-release - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: 'ARnDOSrte/Boost' - file: 'boost_1_73_0.zip' - target: 'boost_1_73_0.zip' - token: ${{ secrets.TEST_TOKEN_RELEASE }} - - - name: Unzip Boost - run: unzip boost_1_73_0.zip - - - name: Configure 3rd parties - run: | - source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-linux/external - - - name: Build 3rd parties - run: | - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux/external --parallel 2 - - - name: Configure CMake - run: | - source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux - - - name: Build - run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 - - - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j2 --output-on-failure - - - name: Prepare Metrix install - if: github.event_name == 'release' - id: metrix-install - run: | - ARCHIVE_NAME="metrix-simulator-centos7.zip" - ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" - zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-linux/install/bin/metrix-simulator - echo "::set-output name=archive_name::$ARCHIVE_NAME" - echo "::set-output name=archive_path::$ARCHIVE_PATH" - - - name: Upload OR-Tools install artifact - if: github.event_name == 'release' - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.metrix-install.outputs.archive_name }} - path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 234ed3089..0e0b686e3 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -115,7 +115,6 @@ jobs: - name: Configure 3rd parties run: | - source /opt/rh/devtoolset-9/enable source /opt/rh/devtoolset-9/enable cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build/external From 82c963988da7263233795bc0606a651771767fe6 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:49:09 +0200 Subject: [PATCH 032/118] Test_centos7_release_38 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 31 ++------ .../workflows/publish_artifact_centos7.yml | 75 +++++++++++++++++++ .github/workflows/qa_pr_cpp_centos7.yml | 5 ++ 3 files changed, 86 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/publish_artifact_centos7.yml diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 734786c34..d35223758 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -1,8 +1,6 @@ name: CI-cpp-centos7 -on: - push: - workflow_dispatch: +on: [push] defaults: run: @@ -43,36 +41,19 @@ jobs: - name: Configure 3rd parties run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-linux/external + cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external - name: Build 3rd parties run: | - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux/external --parallel 2 + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external --parallel 2 - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-linux/install -B $GITHUB_WORKSPACE/metrix-simulator/build-linux + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-centos7/install -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 - name: Build - run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-linux --target install --parallel 2 + run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j2 --output-on-failure - - - name: Prepare Metrix install - if: github.event_name == 'workflow_dispatch' - id: metrix-install - run: | - ARCHIVE_NAME="metrix-simulator-centos7.zip" - ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" - zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-linux/install/bin/metrix-simulator - echo "::set-output name=archive_name::$ARCHIVE_NAME" - echo "::set-output name=archive_path::$ARCHIVE_PATH" - - - name: Upload OR-Tools install artifact - if: github.event_name == 'workflow_dispatch' - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.metrix-install.outputs.archive_name }} - path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file + run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure \ No newline at end of file diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml new file mode 100644 index 000000000..fbc142a0f --- /dev/null +++ b/.github/workflows/publish_artifact_centos7.yml @@ -0,0 +1,75 @@ +name: CI-cpp-centos7 + +on: + workflow_dispatch: + +defaults: + run: + shell: bash + +jobs: + linux: + name: Linux + runs-on: ubuntu-latest + container: 'centos:centos7' + steps: + - name: Install Dependancies + run: | + yum update -y + yum install -y epel-release + yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils + yum install -y devtoolset-9 + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' + + - name: Checkout sources + uses: actions/checkout@v1 + + - name: Download Boost-release + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'ARnDOSrte/Boost' + file: 'boost_1_73_0.zip' + target: 'boost_1_73_0.zip' + token: ${{ secrets.TEST_TOKEN_RELEASE }} + + - name: Unzip Boost + run: unzip boost_1_73_0.zip + + - name: Configure 3rd parties + run: | + source /opt/rh/devtoolset-9/enable + cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external + + - name: Build 3rd parties + run: | + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external --parallel 2 + + - name: Configure CMake + run: | + source /opt/rh/devtoolset-9/enable + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-centos7/install -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 + + - name: Build + run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 + + # - name: Tests + # run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure + + - name: Prepare Metrix install + id: metrix-install + run: | + ARCHIVE_NAME="metrix-simulator-centos7.zip" + ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" + zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-centos7/install/bin/metrix-simulator + echo "::set-output name=archive_name::$ARCHIVE_NAME" + echo "::set-output name=archive_path::$ARCHIVE_PATH" + + - name: Upload OR-Tools install artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.metrix-install.outputs.archive_name }} + path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 0e0b686e3..4dac15c47 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -74,6 +74,11 @@ jobs: yum install -y devtoolset-9 # yum install -y python-pip # pip install --upgrade pip + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' - name: Install Java 11 uses: actions/setup-java@v1 From f6367ed20f267708c33c7dcbbc56ab7ab4144fc9 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:50:49 +0200 Subject: [PATCH 033/118] Test_centos7_release_39 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 4dac15c47..b673421ae 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -75,10 +75,10 @@ jobs: # yum install -y python-pip # pip install --upgrade pip - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.13 - with: - cmake-version: '3.22.x' + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' - name: Install Java 11 uses: actions/setup-java@v1 From 0672a68b5747ddd114d99456a5d72949b62a4ada Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 10:53:20 +0200 Subject: [PATCH 034/118] Test_centos7_release_40 Signed-off-by: arnaud --- .github/workflows/publish_artifact_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml index fbc142a0f..4710b53f8 100644 --- a/.github/workflows/publish_artifact_centos7.yml +++ b/.github/workflows/publish_artifact_centos7.yml @@ -1,4 +1,4 @@ -name: CI-cpp-centos7 +name: publish_centos7 on: workflow_dispatch: From 30f9cd97fd4d50fc249b7fa62bfb3c1d4b9f37f6 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:03:19 +0200 Subject: [PATCH 035/118] Test_centos7_release_41 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 23 +++++++++++++++++++++-- .github/workflows/qa_pr_cpp_centos7.yml | 5 +++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index d35223758..d51a24bfb 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -1,6 +1,8 @@ name: CI-cpp-centos7 -on: [push] +on: + workflow_dispatch: {} + push: {} defaults: run: @@ -56,4 +58,21 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure \ No newline at end of file + run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure + + - name: Prepare Metrix install + if: github.event_name == 'workflow_dispatch' + id: metrix-install + run: | + ARCHIVE_NAME="metrix-simulator-centos7.zip" + ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" + zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-centos7/install/bin/metrix-simulator + echo "::set-output name=archive_name::$ARCHIVE_NAME" + echo "::set-output name=archive_path::$ARCHIVE_PATH" + + - name: Upload OR-Tools install artifact + if: github.event_name == 'workflow_dispatch' + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.metrix-install.outputs.archive_name }} + path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index b673421ae..d0f835312 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -139,7 +139,8 @@ jobs: - name: Configure CMake (For Pull Request) if: github.event_name != 'release' - run: > + run: | + source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost @@ -147,7 +148,7 @@ jobs: -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build - run: > + run: | ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From c67882be96eff1fcddf211901ca2c6085545d59e Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:18:48 +0200 Subject: [PATCH 036/118] Test_centos7_release_42 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index d0f835312..42a14050b 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -130,6 +130,8 @@ jobs: - name: Configure CMake (For Release) if: github.event_name == 'release' run: | + pwd + ls source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug From 40f481b2ca38d0eac68e84460917918480a83e58 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:23:21 +0200 Subject: [PATCH 037/118] Test_centos7_release_43 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 42a14050b..b418b26ba 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -130,8 +130,6 @@ jobs: - name: Configure CMake (For Release) if: github.event_name == 'release' run: | - pwd - ls source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug @@ -142,6 +140,8 @@ jobs: - name: Configure CMake (For Pull Request) if: github.event_name != 'release' run: | + pwd + ls source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug From da01963b1d6c1e46c41893c4d95ee7adc3865b51 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:24:42 +0200 Subject: [PATCH 038/118] correction reseau.cpp Signed-off-by: arnaud --- metrix-simulator/src/reseau.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp index c870af838..8130c6bd9 100644 --- a/metrix-simulator/src/reseau.cpp +++ b/metrix-simulator/src/reseau.cpp @@ -3039,7 +3039,7 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura throw ErrorI(err::ioDico().msg("ERRGrpRandomDifferentGrp", c_fmt("%d", variant->num_))); } } - if (config.randomGroups.empty()){ + if (!config.randomGroups.empty()){ for (const auto& group : groupes_){ if (std::find(config.randomGroups.begin(), config.randomGroups.end(), group.first) == config.randomGroups.end()){ throw ErrorI(err::ioDico().msg("ERRGrpRandomDifferentGrp", c_fmt("%d", variant->num_))); From 334255bd6134092bb7bbc72c56b479f487749ff9 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:37:38 +0200 Subject: [PATCH 039/118] Test_centos7_release_44 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index b418b26ba..f04f088c6 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -142,6 +142,21 @@ jobs: run: | pwd ls + cd __w + echo "on va dans __w" + ls + cd Boost + echo "on va dans Boost" + ls + cd Boost + echo "on va dans Boost suivant" + ls + cd boost_1_73_0 + echo "on va dans boost_1_73_0" + ls + cd installBoost + echo "on va dans installBoost" + ls source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug From f27a1085f1df930f94e85d9852e9771a13fc2a13 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 11:50:04 +0200 Subject: [PATCH 040/118] Test_centos7_release_45 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index d51a24bfb..2b62bffbc 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -52,7 +52,7 @@ jobs: - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-centos7/install -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 + cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-centos7/install -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 From fd51708384f491ecb48dea3e3a87a70cef213353 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 12:01:17 +0200 Subject: [PATCH 041/118] Test_centos7_release_46 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f04f088c6..d3b865a23 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -158,11 +158,7 @@ jobs: echo "on va dans installBoost" ls source /opt/rh/devtoolset-9/enable - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build - -DCMAKE_BUILD_TYPE=Debug - -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost - -DCODE_COVERAGE=FALSE - -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build run: | From 89e8579ea91564dcc324b529a199efff38ea7570 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 12:01:40 +0200 Subject: [PATCH 042/118] Test_centos7_release_47 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index d3b865a23..89b1673b2 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -158,7 +158,7 @@ jobs: echo "on va dans installBoost" ls source /opt/rh/devtoolset-9/enable - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build run: | From e0295312ec5982ade86ae7a7523ca46b4cc704e0 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 12:18:42 +0200 Subject: [PATCH 043/118] Test_centos7_release_48 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 89b1673b2..21892354a 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -158,10 +158,12 @@ jobs: echo "on va dans installBoost" ls source /opt/rh/devtoolset-9/enable - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build run: | + echo ${{ runner.workspace }} + ls ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From d5619f0a16938c76b808c8127f5a119992234e7a Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 14:14:18 +0200 Subject: [PATCH 044/118] Test_centos7_release_49 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 21892354a..d4726e9cd 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -164,9 +164,7 @@ jobs: run: | echo ${{ runner.workspace }} ls - ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 - --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure From c6b2fc687dd9944cf0235c0b1727404848bdd923 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 14:25:10 +0200 Subject: [PATCH 045/118] Test_centos7_release_50 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index d4726e9cd..5ff223f90 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -164,7 +164,7 @@ jobs: run: | echo ${{ runner.workspace }} ls - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target install --parallel 2 - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure From e3aa2d48595b36fe69fae5ceeca5de5a6801457d Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 14:57:28 +0200 Subject: [PATCH 046/118] Test_centos7_release_51 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 122 ++++++++---------------- .github/workflows/qa_pr_cpp_ubuntu.yml | 49 ++-------- 2 files changed, 48 insertions(+), 123 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 5ff223f90..5302837b0 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -32,8 +32,11 @@ jobs: - name: Install clang-tidy run: | - yum install -y clang-tidy-14 - yum update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 + # yum install -y clang-tidy-14 + # yum update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 + sudo yum install centos-release-scl + sudo yum install llvm-toolset-7.0 + scl enable llvm-toolset-7.0 bash - name: Checkout sources uses: actions/checkout@v1 @@ -72,8 +75,10 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - # yum install -y python-pip - # pip install --upgrade pip + yum install -y python-pip + yum install python-devel + yum groupinstall 'development tools' + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v1.13 @@ -85,24 +90,24 @@ jobs: with: java-version: 11 - # - name: Install gcovr - # run: sudo pip install gcovr - - # - name: Install Sonar wrapper - # working-directory: ${{ runner.workspace }} - # run: | - # wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - # unzip build-wrapper-linux-x86.zip - - # - name: Install Sonar scanner - # working-directory: ${{ runner.workspace }} - # run: | - # wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar - # rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # env: - # SONAR_SCANNER_VERSION: 3.3.0.1492 + - name: Install gcovr + run: pip install gcovr + + - name: Install Sonar wrapper + working-directory: ${{ runner.workspace }} + run: | + wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip + unzip build-wrapper-linux-x86.zip + + - name: Install Sonar scanner + working-directory: ${{ runner.workspace }} + run: | + wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar + rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + env: + SONAR_SCANNER_VERSION: 3.3.0.1492 - name: Checkout sources uses: actions/checkout@v1 @@ -140,23 +145,6 @@ jobs: - name: Configure CMake (For Pull Request) if: github.event_name != 'release' run: | - pwd - ls - cd __w - echo "on va dans __w" - ls - cd Boost - echo "on va dans Boost" - ls - cd Boost - echo "on va dans Boost suivant" - ls - cd boost_1_73_0 - echo "on va dans boost_1_73_0" - ls - cd installBoost - echo "on va dans installBoost" - ls source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install @@ -169,17 +157,17 @@ jobs: - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure - # - name: Code coverage - # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - - # - name: Sonarcloud - # working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - # run: > - # ${{ runner.workspace }}/sonar/bin/sonar-scanner - # -Dsonar.host.url=https://sonarcloud.io + - name: Code coverage + run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage + + - name: Sonarcloud + working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: > + ${{ runner.workspace }}/sonar/bin/sonar-scanner + -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' @@ -197,37 +185,3 @@ jobs: with: name: ${{ steps.metrix-install.outputs.archive_name }} path: ${{ steps.metrix-install.outputs.archive_path }} - - # publish_asset: - # name: Publish release assets - # needs: qa - # runs-on: ubuntu-latest - # if: github.event_name == 'release' - # steps: - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: metrix-simulator.zip - # path: ./ - - # - name: Create Release - # id: create_release - # uses: actions/create-release@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - # with: - # tag_name: ${{ github.ref }} - # release_name: Release ${{ github.ref }} - # draft: false - # prerelease: false - - # - name: Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - # with: - # upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - # asset_path: metrix-simulator.zip - # asset_name: metrix-simulator.zip - # asset_content_type: application/zip diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 4b08d173a..5b0c4a5d7 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -4,12 +4,13 @@ on: pull_request: types: [opened, synchronize, edited] release: - types: [created] + types: [created, edited] jobs: clang-tidy: name: clang-tidy runs-on: ubuntu-latest + if: github.event_name == 'release' steps: - name: Install Boost run: | @@ -116,17 +117,16 @@ jobs: run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure - name: Code coverage - if: github.event_name == 'release' run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - # - name: Sonarcloud - # working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - # run: > - # ${{ runner.workspace }}/sonar/bin/sonar-scanner - # -Dsonar.host.url=https://sonarcloud.io + - name: Sonarcloud + working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: > + ${{ runner.workspace }}/sonar/bin/sonar-scanner + -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' @@ -144,32 +144,3 @@ jobs: with: name: ${{ steps.metrix-install.outputs.archive_name }} path: ${{ steps.metrix-install.outputs.archive_path }} - - # publish_asset: - # name: Publish release assets - # needs: qa - # runs-on: ubuntu-latest - # if: github.event_name == 'release' - # steps: - # - name: Download artifacts - # uses: actions/download-artifact@v3 - # with: - # name: metrix-simulator.zip - # path: ./ - - # - name: Get release - # id: get_release - # uses: bruceadams/get-release@v1.3.2 - # env: - # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - - # - name: Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1 - # env: - # GITHUB_TOKEN: ${{ secrets.TEST_TOKEN_RELEASE }} - # with: - # upload_url: ${{ steps.get_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - # asset_path: metrix-simulator.zip - # asset_name: metrix-simulator.zip - # asset_content_type: application/zip From 7d9a6219caa0654b1a88c3580a036d3fe635c071 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 14:58:33 +0200 Subject: [PATCH 047/118] Test_centos7_release_52 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_ubuntu.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 5b0c4a5d7..6552b7c49 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -10,7 +10,6 @@ jobs: clang-tidy: name: clang-tidy runs-on: ubuntu-latest - if: github.event_name == 'release' steps: - name: Install Boost run: | From f9fe576693943701ceb1f5c52a351f70b274dd98 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 15:04:25 +0200 Subject: [PATCH 048/118] Test_centos7_release_53 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 5302837b0..ff5c89607 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -76,8 +76,8 @@ jobs: yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 yum install -y python-pip - yum install python-devel - yum groupinstall 'development tools' + yum install -y python-devel + yum groupinstall -y 'development tools' - name: Setup cmake From 070537bcc907ba7f4bb8a71b9cf1bd4ff17bdca4 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 15:09:40 +0200 Subject: [PATCH 049/118] Test_centos7_release_54 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index ff5c89607..34d430dbf 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -76,6 +76,7 @@ jobs: yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 yum install -y python-pip + pip install --upgrade pip yum install -y python-devel yum groupinstall -y 'development tools' From 9df7a402784015d8b455d4c0008507b24910697d Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 15:14:54 +0200 Subject: [PATCH 050/118] Test_centos7_release_55 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 34d430dbf..151664680 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -34,8 +34,8 @@ jobs: run: | # yum install -y clang-tidy-14 # yum update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 - sudo yum install centos-release-scl - sudo yum install llvm-toolset-7.0 + yum install centos-release-scl + yum install llvm-toolset-7.0 scl enable llvm-toolset-7.0 bash - name: Checkout sources From c5493652e19de45415bdeae5c5b3de8144de9d11 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 15:28:18 +0200 Subject: [PATCH 051/118] Test_centos7_release_56 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 151664680..2e7e922e7 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -34,8 +34,8 @@ jobs: run: | # yum install -y clang-tidy-14 # yum update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-14 100 - yum install centos-release-scl - yum install llvm-toolset-7.0 + yum install -y centos-release-scl + yum install -y llvm-toolset-7.0 scl enable llvm-toolset-7.0 bash - name: Checkout sources @@ -75,10 +75,10 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - yum install -y python-pip - pip install --upgrade pip - yum install -y python-devel - yum groupinstall -y 'development tools' + # yum install -y python-pip + # pip install --upgrade pip + # yum install -y python-devel + # yum groupinstall -y 'development tools' - name: Setup cmake @@ -91,8 +91,8 @@ jobs: with: java-version: 11 - - name: Install gcovr - run: pip install gcovr + # - name: Install gcovr + # run: pip install gcovr - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} From 2a72c908c5ea87ae57e9b7d5b257268a69090dda Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 15:46:15 +0200 Subject: [PATCH 052/118] Test_centos7_release_57 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 2e7e922e7..e59ce26e1 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -18,6 +18,14 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v1.13 + with: + cmake-version: '3.22.x' + + - name: Checkout sources + uses: actions/checkout@v1 - name: Download Boost-release uses: dsaltares/fetch-gh-release-asset@master @@ -38,9 +46,6 @@ jobs: yum install -y llvm-toolset-7.0 scl enable llvm-toolset-7.0 bash - - name: Checkout sources - uses: actions/checkout@v1 - - name: Configure 3rd parties run: | source /opt/rh/devtoolset-9/enable From 40448b1095aa7e671108d9dc9cb6b13048bb7896 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 16:56:39 +0200 Subject: [PATCH 053/118] Test_centos7_release_58 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index e59ce26e1..668ea76ec 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -52,7 +52,18 @@ jobs: cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-linux/external - name: Build 3rd parties - run: > + run: | + pwd + ls + cd metrix-simulator + echo "on part dans metrix-simulator" + ls + cd build + echo "on part dans build" + ls + cd external + echo "on part dans external" + ls cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 - name: Configure CMake From 6773ae3312b160ca9efd5785ccfa5a666127f67f Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 17:04:37 +0200 Subject: [PATCH 054/118] Test_centos7_release_59 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 668ea76ec..ff43a0f7e 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -49,27 +49,16 @@ jobs: - name: Configure 3rd parties run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-linux/external + cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external - name: Build 3rd parties run: | - pwd - ls - cd metrix-simulator - echo "on part dans metrix-simulator" - ls - cd build - echo "on part dans build" - ls - cd external - echo "on part dans external" - ls - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external --parallel 2 - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build + cmake -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_EXPORT_COMPILE_COMMANDS=ON @@ -78,7 +67,7 @@ jobs: run: | export MODIFIED_FILES=$(git diff --name-only --diff-filter=d origin/${{ github.base_ref }} origin/${{ github.head_ref }} | grep -E ".*(metrix-simulator/src|metrix-simulator/log).*\.(cpp|hpp)$") if [ -n "$MODIFIED_FILES" ]; then - clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build + clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build-centos7 fi qa: name: QA - full From 8fe00f817bc5284448c205e4e09eaefcf90e9106 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 17:18:42 +0200 Subject: [PATCH 055/118] Test_centos7_release_60 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index ff43a0f7e..72d946a65 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -58,10 +58,7 @@ jobs: - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 - -DCMAKE_BUILD_TYPE=Debug - -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + cmake -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - name: Clang Tidy run: | From eda9ec202cee965d8d4d2c596835f653d9f02c54 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 17:36:50 +0200 Subject: [PATCH 056/118] Test_centos7_release_61 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 72d946a65..ad4afd361 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -96,6 +96,9 @@ jobs: # - name: Install gcovr # run: pip install gcovr + - name: Install gcovr + run: yum install -y gcovr + - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} run: | From 0e561b924ee41ab94ac9b07fa6665ee9e7746cd5 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 17:45:25 +0200 Subject: [PATCH 057/118] Test_centos7_release_62 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index ad4afd361..4160efba4 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -97,7 +97,7 @@ jobs: # run: pip install gcovr - name: Install gcovr - run: yum install -y gcovr + run: yum install -y gcov - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} From 0a775c3b413838f3639ec39706233d01a19b1342 Mon Sep 17 00:00:00 2001 From: arnaud Date: Mon, 16 Oct 2023 17:49:50 +0200 Subject: [PATCH 058/118] Test_centos7_release_63 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 4160efba4..c3a15a524 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -97,7 +97,7 @@ jobs: # run: pip install gcovr - name: Install gcovr - run: yum install -y gcov + run: yum install -y gcov-tool - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} From 37c61971469720a7dfe778b80359c1272412269a Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 09:55:25 +0200 Subject: [PATCH 059/118] Test_centos7_release_64 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index c3a15a524..86fd2f46f 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -97,7 +97,12 @@ jobs: # run: pip install gcovr - name: Install gcovr - run: yum install -y gcov-tool + run: | + yum -y install libxml2-devel libxslt-devel + yum -y clean all + pip3 install wheel + pip3 install gcovr cpplint + - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} From b340566cc6bdc44d028849ef19d8be48c47bc4f4 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 10:03:47 +0200 Subject: [PATCH 060/118] Test_centos7_release_65 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 86fd2f46f..902bf63a7 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -77,10 +77,7 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - # yum install -y python-pip - # pip install --upgrade pip - # yum install -y python-devel - # yum groupinstall -y 'development tools' + yum install -y python3-pip - name: Setup cmake From aa795d6fb3a110a0d679ab7a5803c2fa77f97669 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 10:14:09 +0200 Subject: [PATCH 061/118] Test_centos7_release_66 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 4 ++-- .github/workflows/qa_pr_cpp_ubuntu.yml | 2 +- metrix-simulator/src/calculeEmpilementGroupes.cpp | 1 + metrix-simulator/src/calculecrirecontraintesdodu.cpp | 1 + metrix-simulator/src/calculmacrofonctions.cpp | 1 + metrix-simulator/src/compute/solver.cpp | 1 + metrix-simulator/src/config/configuration.cpp | 1 + metrix-simulator/src/margin_variations_compute.cpp | 1 + metrix-simulator/src/metrix2assess.cpp | 1 + metrix-simulator/src/reseau.cpp | 1 + 10 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 902bf63a7..bdc1cec54 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -77,7 +77,7 @@ jobs: yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils yum install -y devtoolset-9 - yum install -y python3-pip + yum install -y python3 python3-pip - name: Setup cmake @@ -163,7 +163,7 @@ jobs: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target install --parallel 2 - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure + run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure - name: Code coverage run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 6552b7c49..128e131fe 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -113,7 +113,7 @@ jobs: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure + run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure - name: Code coverage run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp index b04b1e94a..703cc8373 100644 --- a/metrix-simulator/src/calculeEmpilementGroupes.cpp +++ b/metrix-simulator/src/calculeEmpilementGroupes.cpp @@ -177,6 +177,7 @@ int Calculer::empilementEconomiqueDesGroupes(const std::shared_ptr& va LOG_ALL(info) << err::ioDico().msg("INFOSPXPenalisationTDHVDC"); } + // utilisation de PneSolveur int status = METRIX_PAS_PROBLEME; status = PneSolveur(UTILISATION_SIMPLEXE, varianteCourante); diff --git a/metrix-simulator/src/calculecrirecontraintesdodu.cpp b/metrix-simulator/src/calculecrirecontraintesdodu.cpp index 60ce6723c..d8f7ffb68 100644 --- a/metrix-simulator/src/calculecrirecontraintesdodu.cpp +++ b/metrix-simulator/src/calculecrirecontraintesdodu.cpp @@ -4024,6 +4024,7 @@ int Calculer::ajoutContraintes(bool& existe_contrainte_active, return METRIX_PAS_PROBLEME; } + int Calculer::ajoutContrainte(const std::shared_ptr& ctre, const std::vector& secondMembreFixe) { if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef) diff --git a/metrix-simulator/src/calculmacrofonctions.cpp b/metrix-simulator/src/calculmacrofonctions.cpp index 7532bca43..42f7796b4 100644 --- a/metrix-simulator/src/calculmacrofonctions.cpp +++ b/metrix-simulator/src/calculmacrofonctions.cpp @@ -911,6 +911,7 @@ void Calculer::printFctObj(bool silent) } } + consoTotale_ = sumProdApresEmpilement; fonction_objectif_C_ += fonction_objectif_G_cur_ + fonction_objectif_D_cur_; diff --git a/metrix-simulator/src/compute/solver.cpp b/metrix-simulator/src/compute/solver.cpp index 816ab720c..2800e74ef 100644 --- a/metrix-simulator/src/compute/solver.cpp +++ b/metrix-simulator/src/compute/solver.cpp @@ -16,6 +16,7 @@ namespace compute { void Solver::solve(PROBLEME_A_RESOUDRE* pne_problem) { PNE_Solveur(pne_problem); } + void Solver::solve(PROBLEME_SIMPLEXE* spx_problem) { if (problem_ != nullptr) { diff --git a/metrix-simulator/src/config/configuration.cpp b/metrix-simulator/src/config/configuration.cpp index 644b8a30f..03a6f6eab 100644 --- a/metrix-simulator/src/config/configuration.cpp +++ b/metrix-simulator/src/config/configuration.cpp @@ -316,6 +316,7 @@ void Configuration::initWithRawConfig(const raw_configuration& raw_config) cost_ecart_ = helper::updateValueNumber(std::get(raw_config), "COUTECAR", 10); noise_cost_ = helper::updateValueNumber(std::get(raw_config), "NULLCOST", 0.5); + lost_load_detailed_max_ = helper::updateValueNumber(std::get(raw_config), "LOSTCMAX", 100U); // log level diff --git a/metrix-simulator/src/margin_variations_compute.cpp b/metrix-simulator/src/margin_variations_compute.cpp index a9729d699..f9b556867 100644 --- a/metrix-simulator/src/margin_variations_compute.cpp +++ b/metrix-simulator/src/margin_variations_compute.cpp @@ -14,6 +14,7 @@ #include + MarginVariationMatrix::MarginVariationMatrix(int nbConstraints, int nbComplementaryVar, int nbVars, diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index f31bba507..928553afc 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1629,6 +1629,7 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, << typeEtat_[numVar]; } + } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp index 8130c6bd9..cccea0f56 100644 --- a/metrix-simulator/src/reseau.cpp +++ b/metrix-simulator/src/reseau.cpp @@ -3031,6 +3031,7 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura } } + for (const auto& group : config.randomGroups) { auto groupesIt = groupes_.find(group); if (groupesIt != groupes_.end()) { From 388ff98386315292db0a8f7c13a402a2141dbcc0 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 10:35:50 +0200 Subject: [PATCH 062/118] Test_centos7_release_67 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 3 ++- .github/workflows/qa_pr_cpp_ubuntu.yml | 3 ++- metrix-simulator/src/calculeEmpilementGroupes.cpp | 1 - metrix-simulator/src/calculecrirecontraintesdodu.cpp | 1 - metrix-simulator/src/calculmacrofonctions.cpp | 1 - metrix-simulator/src/compute/solver.cpp | 1 - metrix-simulator/src/config/configuration.cpp | 1 - metrix-simulator/src/margin_variations_compute.cpp | 1 - metrix-simulator/src/metrix2assess.cpp | 1 - metrix-simulator/src/reseau.cpp | 1 - 10 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index bdc1cec54..c21f996ec 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -63,6 +63,7 @@ jobs: - name: Clang Tidy run: | export MODIFIED_FILES=$(git diff --name-only --diff-filter=d origin/${{ github.base_ref }} origin/${{ github.head_ref }} | grep -E ".*(metrix-simulator/src|metrix-simulator/log).*\.(cpp|hpp)$") + echo $MODIFIED_FILES if [ -n "$MODIFIED_FILES" ]; then clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build-centos7 fi @@ -154,7 +155,7 @@ jobs: if: github.event_name != 'release' run: | source /opt/rh/devtoolset-9/enable - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build run: | diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 128e131fe..6863561c6 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -41,6 +41,7 @@ jobs: - name: Clang Tidy run: | export MODIFIED_FILES=$(git diff --name-only --diff-filter=d origin/${{ github.base_ref }} origin/${{ github.head_ref }} | grep -E ".*(metrix-simulator/src|metrix-simulator/log).*\.(cpp|hpp)$") + echo $MODIFIED_FILES if [ -n "$MODIFIED_FILES" ]; then clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build fi @@ -103,7 +104,7 @@ jobs: run: > cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug - -DCODE_COVERAGE=FALSE + -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp index 703cc8373..b04b1e94a 100644 --- a/metrix-simulator/src/calculeEmpilementGroupes.cpp +++ b/metrix-simulator/src/calculeEmpilementGroupes.cpp @@ -177,7 +177,6 @@ int Calculer::empilementEconomiqueDesGroupes(const std::shared_ptr& va LOG_ALL(info) << err::ioDico().msg("INFOSPXPenalisationTDHVDC"); } - // utilisation de PneSolveur int status = METRIX_PAS_PROBLEME; status = PneSolveur(UTILISATION_SIMPLEXE, varianteCourante); diff --git a/metrix-simulator/src/calculecrirecontraintesdodu.cpp b/metrix-simulator/src/calculecrirecontraintesdodu.cpp index d8f7ffb68..60ce6723c 100644 --- a/metrix-simulator/src/calculecrirecontraintesdodu.cpp +++ b/metrix-simulator/src/calculecrirecontraintesdodu.cpp @@ -4024,7 +4024,6 @@ int Calculer::ajoutContraintes(bool& existe_contrainte_active, return METRIX_PAS_PROBLEME; } - int Calculer::ajoutContrainte(const std::shared_ptr& ctre, const std::vector& secondMembreFixe) { if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef) diff --git a/metrix-simulator/src/calculmacrofonctions.cpp b/metrix-simulator/src/calculmacrofonctions.cpp index 42f7796b4..7532bca43 100644 --- a/metrix-simulator/src/calculmacrofonctions.cpp +++ b/metrix-simulator/src/calculmacrofonctions.cpp @@ -911,7 +911,6 @@ void Calculer::printFctObj(bool silent) } } - consoTotale_ = sumProdApresEmpilement; fonction_objectif_C_ += fonction_objectif_G_cur_ + fonction_objectif_D_cur_; diff --git a/metrix-simulator/src/compute/solver.cpp b/metrix-simulator/src/compute/solver.cpp index 2800e74ef..816ab720c 100644 --- a/metrix-simulator/src/compute/solver.cpp +++ b/metrix-simulator/src/compute/solver.cpp @@ -16,7 +16,6 @@ namespace compute { void Solver::solve(PROBLEME_A_RESOUDRE* pne_problem) { PNE_Solveur(pne_problem); } - void Solver::solve(PROBLEME_SIMPLEXE* spx_problem) { if (problem_ != nullptr) { diff --git a/metrix-simulator/src/config/configuration.cpp b/metrix-simulator/src/config/configuration.cpp index 03a6f6eab..644b8a30f 100644 --- a/metrix-simulator/src/config/configuration.cpp +++ b/metrix-simulator/src/config/configuration.cpp @@ -316,7 +316,6 @@ void Configuration::initWithRawConfig(const raw_configuration& raw_config) cost_ecart_ = helper::updateValueNumber(std::get(raw_config), "COUTECAR", 10); noise_cost_ = helper::updateValueNumber(std::get(raw_config), "NULLCOST", 0.5); - lost_load_detailed_max_ = helper::updateValueNumber(std::get(raw_config), "LOSTCMAX", 100U); // log level diff --git a/metrix-simulator/src/margin_variations_compute.cpp b/metrix-simulator/src/margin_variations_compute.cpp index f9b556867..a9729d699 100644 --- a/metrix-simulator/src/margin_variations_compute.cpp +++ b/metrix-simulator/src/margin_variations_compute.cpp @@ -14,7 +14,6 @@ #include - MarginVariationMatrix::MarginVariationMatrix(int nbConstraints, int nbComplementaryVar, int nbVars, diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index 928553afc..f31bba507 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1629,7 +1629,6 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, << typeEtat_[numVar]; } - } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp index cccea0f56..8130c6bd9 100644 --- a/metrix-simulator/src/reseau.cpp +++ b/metrix-simulator/src/reseau.cpp @@ -3031,7 +3031,6 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura } } - for (const auto& group : config.randomGroups) { auto groupesIt = groupes_.find(group); if (groupesIt != groupes_.end()) { From 8fc403f00c44201b0ac75b6692a4307d4bf72716 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 10:40:23 +0200 Subject: [PATCH 063/118] Test_centos7_release_68 Signed-off-by: arnaud --- metrix-simulator/src/calculeEmpilementGroupes.cpp | 1 + metrix-simulator/src/calculecrirecontraintesdodu.cpp | 2 +- metrix-simulator/src/calculmacrofonctions.cpp | 2 +- metrix-simulator/src/calculrepports.cpp | 2 +- metrix-simulator/src/metrix2assess.cpp | 2 +- metrix-simulator/src/reseau.cpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp index b04b1e94a..25fc8161f 100644 --- a/metrix-simulator/src/calculeEmpilementGroupes.cpp +++ b/metrix-simulator/src/calculeEmpilementGroupes.cpp @@ -191,3 +191,4 @@ int Calculer::empilementEconomiqueDesGroupes(const std::shared_ptr& va } return METRIX_PAS_PROBLEME; } +// TEST diff --git a/metrix-simulator/src/calculecrirecontraintesdodu.cpp b/metrix-simulator/src/calculecrirecontraintesdodu.cpp index 60ce6723c..a92d92cef 100644 --- a/metrix-simulator/src/calculecrirecontraintesdodu.cpp +++ b/metrix-simulator/src/calculecrirecontraintesdodu.cpp @@ -4023,7 +4023,7 @@ int Calculer::ajoutContraintes(bool& existe_contrainte_active, return METRIX_PAS_PROBLEME; } - +// TEST int Calculer::ajoutContrainte(const std::shared_ptr& ctre, const std::vector& secondMembreFixe) { if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef) diff --git a/metrix-simulator/src/calculmacrofonctions.cpp b/metrix-simulator/src/calculmacrofonctions.cpp index 7532bca43..3336ca035 100644 --- a/metrix-simulator/src/calculmacrofonctions.cpp +++ b/metrix-simulator/src/calculmacrofonctions.cpp @@ -914,7 +914,7 @@ void Calculer::printFctObj(bool silent) consoTotale_ = sumProdApresEmpilement; fonction_objectif_C_ += fonction_objectif_G_cur_ + fonction_objectif_D_cur_; - +// TEST if (!silent) { std::stringstream ss; ss << err::ioDico().msg("INFOResMW") << std::endl; diff --git a/metrix-simulator/src/calculrepports.cpp b/metrix-simulator/src/calculrepports.cpp index ba666a66a..1c3fd3a06 100644 --- a/metrix-simulator/src/calculrepports.cpp +++ b/metrix-simulator/src/calculrepports.cpp @@ -132,7 +132,7 @@ int Calculer::calculCoefsReport(std::shared_ptr icdt) icdt->validite_ = false; return METRIX_PAS_PROBLEME; } - +// TEST for (auto& quad : res_.quadsSurv_) { int ii = quad->tnnorqua(); int jj = quad->tnnexqua(); diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index f31bba507..1c45d0648 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1628,7 +1628,7 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, LOG_ALL(warning) << "probleme lors de la restitution des variations marginales " << typeEtat_[numVar]; } - +// TEST } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp index 8130c6bd9..5306c4d03 100644 --- a/metrix-simulator/src/reseau.cpp +++ b/metrix-simulator/src/reseau.cpp @@ -3038,7 +3038,7 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura } else { throw ErrorI(err::ioDico().msg("ERRGrpRandomDifferentGrp", c_fmt("%d", variant->num_))); } - } + }// TEST if (!config.randomGroups.empty()){ for (const auto& group : groupes_){ if (std::find(config.randomGroups.begin(), config.randomGroups.end(), group.first) == config.randomGroups.end()){ From 12532ccb58be473ef33c160259aff9578f4d7a4a Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 12:25:34 +0200 Subject: [PATCH 064/118] Test_centos7_release_69 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 9 ++++----- metrix-simulator/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index c21f996ec..fce648ab0 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -159,10 +159,9 @@ jobs: - name: Build run: | - echo ${{ runner.workspace }} - ls - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target install --parallel 2 - + ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 + --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure @@ -174,7 +173,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: > + run: | ${{ runner.workspace }}/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io diff --git a/metrix-simulator/CMakeLists.txt b/metrix-simulator/CMakeLists.txt index cf7487d27..8792b5348 100755 --- a/metrix-simulator/CMakeLists.txt +++ b/metrix-simulator/CMakeLists.txt @@ -194,3 +194,6 @@ write_basic_package_version_file( install(FILES "${CMAKE_CURRENT_BINARY_DIR}/metrix-simulator-config.cmake" DESTINATION ${INSTALL_CMAKE_DIR} ) +message("On affiche la version du compilo") +message(CMAKE_CXX_COMPILER_ID) +message(CMAKE_CXX_COMPILER_VERSION) \ No newline at end of file From 29e2d7bf82fa25d2d00c5dd47001523cd1a7ebc9 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 12:28:00 +0200 Subject: [PATCH 065/118] Test_centos7_release_70 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index fce648ab0..3342660ae 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -159,8 +159,7 @@ jobs: - name: Build run: | - ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 - --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From a8fdadc4de8588dc6618db7a1ae8a95b1bd42a89 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 12:30:41 +0200 Subject: [PATCH 066/118] Test_centos7_release_71 Signed-off-by: arnaud --- metrix-simulator/src/calculeEmpilementGroupes.cpp | 1 - metrix-simulator/src/calculecrirecontraintesdodu.cpp | 2 +- metrix-simulator/src/calculmacrofonctions.cpp | 2 +- metrix-simulator/src/calculrepports.cpp | 2 +- metrix-simulator/src/metrix2assess.cpp | 2 +- metrix-simulator/src/reseau.cpp | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp index 25fc8161f..b04b1e94a 100644 --- a/metrix-simulator/src/calculeEmpilementGroupes.cpp +++ b/metrix-simulator/src/calculeEmpilementGroupes.cpp @@ -191,4 +191,3 @@ int Calculer::empilementEconomiqueDesGroupes(const std::shared_ptr& va } return METRIX_PAS_PROBLEME; } -// TEST diff --git a/metrix-simulator/src/calculecrirecontraintesdodu.cpp b/metrix-simulator/src/calculecrirecontraintesdodu.cpp index a92d92cef..60ce6723c 100644 --- a/metrix-simulator/src/calculecrirecontraintesdodu.cpp +++ b/metrix-simulator/src/calculecrirecontraintesdodu.cpp @@ -4023,7 +4023,7 @@ int Calculer::ajoutContraintes(bool& existe_contrainte_active, return METRIX_PAS_PROBLEME; } -// TEST + int Calculer::ajoutContrainte(const std::shared_ptr& ctre, const std::vector& secondMembreFixe) { if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef) diff --git a/metrix-simulator/src/calculmacrofonctions.cpp b/metrix-simulator/src/calculmacrofonctions.cpp index 3336ca035..7532bca43 100644 --- a/metrix-simulator/src/calculmacrofonctions.cpp +++ b/metrix-simulator/src/calculmacrofonctions.cpp @@ -914,7 +914,7 @@ void Calculer::printFctObj(bool silent) consoTotale_ = sumProdApresEmpilement; fonction_objectif_C_ += fonction_objectif_G_cur_ + fonction_objectif_D_cur_; -// TEST + if (!silent) { std::stringstream ss; ss << err::ioDico().msg("INFOResMW") << std::endl; diff --git a/metrix-simulator/src/calculrepports.cpp b/metrix-simulator/src/calculrepports.cpp index 1c3fd3a06..ba666a66a 100644 --- a/metrix-simulator/src/calculrepports.cpp +++ b/metrix-simulator/src/calculrepports.cpp @@ -132,7 +132,7 @@ int Calculer::calculCoefsReport(std::shared_ptr icdt) icdt->validite_ = false; return METRIX_PAS_PROBLEME; } -// TEST + for (auto& quad : res_.quadsSurv_) { int ii = quad->tnnorqua(); int jj = quad->tnnexqua(); diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index 1c45d0648..f31bba507 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1628,7 +1628,7 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, LOG_ALL(warning) << "probleme lors de la restitution des variations marginales " << typeEtat_[numVar]; } -// TEST + } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp index 5306c4d03..8130c6bd9 100644 --- a/metrix-simulator/src/reseau.cpp +++ b/metrix-simulator/src/reseau.cpp @@ -3038,7 +3038,7 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura } else { throw ErrorI(err::ioDico().msg("ERRGrpRandomDifferentGrp", c_fmt("%d", variant->num_))); } - }// TEST + } if (!config.randomGroups.empty()){ for (const auto& group : groupes_){ if (std::find(config.randomGroups.begin(), config.randomGroups.end(), group.first) == config.randomGroups.end()){ From 64255fc6fde8ba758c80aaf1fbf17ed657e4644f Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 12:44:57 +0200 Subject: [PATCH 067/118] Test_centos7_release_72 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 9 +++++++++ metrix-simulator/CMakeLists.txt | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 3342660ae..6fbc856d6 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -105,8 +105,17 @@ jobs: - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} run: | + pwd wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip + ls + cd build-wrapper-linux-x86 + echo "On part dans build-wrapper-linux-x86" + ls + cd build-wrapper-linux-x86 + echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86" + ls + cd../.. - name: Install Sonar scanner working-directory: ${{ runner.workspace }} diff --git a/metrix-simulator/CMakeLists.txt b/metrix-simulator/CMakeLists.txt index 8792b5348..6fa8b2716 100755 --- a/metrix-simulator/CMakeLists.txt +++ b/metrix-simulator/CMakeLists.txt @@ -193,7 +193,4 @@ write_basic_package_version_file( ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/metrix-simulator-config.cmake" DESTINATION ${INSTALL_CMAKE_DIR} -) -message("On affiche la version du compilo") -message(CMAKE_CXX_COMPILER_ID) -message(CMAKE_CXX_COMPILER_VERSION) \ No newline at end of file +) \ No newline at end of file From 86f3848cd2338128f77509d0829c7f3c02ca73b6 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 12:46:14 +0200 Subject: [PATCH 068/118] Test_centos7_release_73 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 6fbc856d6..efb20ddaa 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -105,7 +105,7 @@ jobs: - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} run: | - pwd + pwd wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip ls From 229debb1232c5df51b62eb888fc7840a8a7b3700 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 13:40:43 +0200 Subject: [PATCH 069/118] Test_centos7_release_74 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index efb20ddaa..bd4811634 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -109,10 +109,10 @@ jobs: wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip ls - cd build-wrapper-linux-x86 + cd build-wrapper-linux-x86-64 echo "On part dans build-wrapper-linux-x86" ls - cd build-wrapper-linux-x86 + cd build-wrapper-linux-x86-64 echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86" ls cd../.. @@ -168,7 +168,7 @@ jobs: - name: Build run: | - ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + ${{ runner.workspace }}/build-wrapper-linux-x86-64/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 3336cb2f9585b402024bb27460939d5558c1e707 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 13:47:10 +0200 Subject: [PATCH 070/118] Test_centos7_release_75 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index bd4811634..cd3fef2cb 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -109,11 +109,11 @@ jobs: wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip ls - cd build-wrapper-linux-x86-64 + cd build-wrapper-linux-x86 echo "On part dans build-wrapper-linux-x86" ls cd build-wrapper-linux-x86-64 - echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86" + echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" ls cd../.. @@ -168,7 +168,7 @@ jobs: - name: Build run: | - ${{ runner.workspace }}/build-wrapper-linux-x86-64/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 9b9d057b1a974b11f2b70c9d29079f5c8246d78c Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 13:55:46 +0200 Subject: [PATCH 071/118] Test_centos7_release_76 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index cd3fef2cb..f5624a90f 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -112,10 +112,10 @@ jobs: cd build-wrapper-linux-x86 echo "On part dans build-wrapper-linux-x86" ls - cd build-wrapper-linux-x86-64 - echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" - ls - cd../.. + # cd build-wrapper-linux-x86-64 + # echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" + # ls + cd.. - name: Install Sonar scanner working-directory: ${{ runner.workspace }} From 8d75fa8286980e86447ad633865f7421806e92fc Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 14:02:35 +0200 Subject: [PATCH 072/118] Test_centos7_release_77 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- .github/workflows/ci_ubuntu.yml | 2 +- .github/workflows/maven_centos7.yml | 2 +- .github/workflows/maven_ubuntu.yml | 2 +- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 2b62bffbc..8df4e6411 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -2,7 +2,7 @@ name: CI-cpp-centos7 on: workflow_dispatch: {} - push: {} + # push: {} defaults: run: diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 6f6f18634..eae115523 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -1,6 +1,6 @@ name: CI-cpp-ubuntu -on: [push] +on: [release] defaults: run: diff --git a/.github/workflows/maven_centos7.yml b/.github/workflows/maven_centos7.yml index b539aa479..a05e4b9cc 100644 --- a/.github/workflows/maven_centos7.yml +++ b/.github/workflows/maven_centos7.yml @@ -1,6 +1,6 @@ name: CI_centos7 -on: [push] +on: [release] jobs: build: diff --git a/.github/workflows/maven_ubuntu.yml b/.github/workflows/maven_ubuntu.yml index 4dd20fe13..dda0ef3a0 100644 --- a/.github/workflows/maven_ubuntu.yml +++ b/.github/workflows/maven_ubuntu.yml @@ -1,6 +1,6 @@ name: CI_ubuntu -on: [push] +on: [release] jobs: build: diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f5624a90f..214cb2539 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -115,7 +115,7 @@ jobs: # cd build-wrapper-linux-x86-64 # echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" # ls - cd.. + cd .. - name: Install Sonar scanner working-directory: ${{ runner.workspace }} From 1813fe7b2b30daaff658261b516fcaddf351f9cd Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 14:24:15 +0200 Subject: [PATCH 073/118] Test_centos7_release_78 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 214cb2539..d0b3f6818 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -109,13 +109,17 @@ jobs: wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip ls + echo a1 + echo b1 cd build-wrapper-linux-x86 echo "On part dans build-wrapper-linux-x86" ls - # cd build-wrapper-linux-x86-64 - # echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" - # ls - cd .. + echo a2 + echo b2 + cd build-wrapper-linux-x86-64 + echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" + ls + cd ../.. - name: Install Sonar scanner working-directory: ${{ runner.workspace }} From a276d1fe792c1b37b49cd7528b6dd7cb3f031735 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:14:44 +0200 Subject: [PATCH 074/118] Test_centos7_release_79 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 9 ++++----- .github/workflows/qa_pr_cpp_ubuntu.yml | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index d0b3f6818..57531a1b9 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -105,6 +105,7 @@ jobs: - name: Install Sonar wrapper working-directory: ${{ runner.workspace }} run: | + echo ${{ runner.workspace }} pwd wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip @@ -116,10 +117,7 @@ jobs: ls echo a2 echo b2 - cd build-wrapper-linux-x86-64 - echo "on part dans build-wrapper-linux-x86/build-wrapper-linux-x86-64" - ls - cd ../.. + cd .. - name: Install Sonar scanner working-directory: ${{ runner.workspace }} @@ -172,7 +170,8 @@ jobs: - name: Build run: | - ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + echo ${{ runner.workspace }} + /__w/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 6863561c6..709cbf5d2 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -1,8 +1,8 @@ name: QA-PR-CPP-UBUNTU on: - pull_request: - types: [opened, synchronize, edited] + # pull_request: + # types: [opened, synchronize, edited] release: types: [created, edited] From 8902fd829f30e78501dcbcb9197f2302f74706c8 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:21:47 +0200 Subject: [PATCH 075/118] Test_centos7_release_80 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 57531a1b9..d522390ab 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -171,7 +171,8 @@ jobs: - name: Build run: | echo ${{ runner.workspace }} - /__w/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + pwd + /home/runner/work/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 6609bf123e22999661d06d36d45faf8dc9744d8b Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:32:19 +0200 Subject: [PATCH 076/118] Test_centos7_release_81 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index d522390ab..df6428f23 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -172,6 +172,7 @@ jobs: run: | echo ${{ runner.workspace }} pwd + ls /home/runner/work/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests From 3f1168146ac51dd3728e909978a72fa9e3435c4e Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:39:40 +0200 Subject: [PATCH 077/118] Test_centos7_release_82 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index df6428f23..36103241c 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,7 +173,17 @@ jobs: echo ${{ runner.workspace }} pwd ls - /home/runner/work/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + cd __w + echo "on va dans __w" + ls + cd powsybl-metrix + echo "on va dans powsybl-metrix" + ls + cd powsybl-metrix + echo "on va dans powsybl-metrix" + ls + cd ../../.. + __w/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 06304a75434daa957403b994aa8ebf268d215058 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:48:55 +0200 Subject: [PATCH 078/118] Test_centos7_release_83 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 36103241c..ec9c0df4a 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,16 +173,16 @@ jobs: echo ${{ runner.workspace }} pwd ls - cd __w - echo "on va dans __w" - ls - cd powsybl-metrix - echo "on va dans powsybl-metrix" + cd + pwd + cd ${{ runner.workspace }} + echo "on va dans ${{ runner.workspace }}" ls - cd powsybl-metrix - echo "on va dans powsybl-metrix" + cd build-wrapper-linux-x86 + echo "on va dans build-wrapper-linux-x86" ls - cd ../../.. + cd + cd $GITHUB_WORKSPACE __w/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests From 9cf33514d2261fc96b054465d41711533bd8dcd8 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 15:55:52 +0200 Subject: [PATCH 079/118] Test_centos7_release_84 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index ec9c0df4a..a60700183 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -175,6 +175,7 @@ jobs: ls cd pwd + ls cd ${{ runner.workspace }} echo "on va dans ${{ runner.workspace }}" ls From c6edcb22fdf03cea0b5337f16b89fa4d876d1ecc Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 16:04:32 +0200 Subject: [PATCH 080/118] Test_centos7_release_85 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index a60700183..fd829230f 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -168,24 +168,13 @@ jobs: source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + - name: Build-Sonar + working-directory: ${{ runner.workspace }} + run: ${{ runner.workspace }}/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + - name: Build - run: | - echo ${{ runner.workspace }} - pwd - ls - cd - pwd - ls - cd ${{ runner.workspace }} - echo "on va dans ${{ runner.workspace }}" - ls - cd build-wrapper-linux-x86 - echo "on va dans build-wrapper-linux-x86" - ls - cd - cd $GITHUB_WORKSPACE - __w/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 79a9029746121afffba1b41dbc9a01292f647480 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 16:18:42 +0200 Subject: [PATCH 081/118] Test_centos7_release_86 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index fd829230f..ea022ae34 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -170,7 +170,10 @@ jobs: - name: Build-Sonar working-directory: ${{ runner.workspace }} - run: ${{ runner.workspace }}/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + run: | + pwd + ls + ${{ runner.workspace }}/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From fa8fecd29ddbf8c26fd7ea236f3de06fe9ab75a0 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 16:25:13 +0200 Subject: [PATCH 082/118] Test_centos7_release_87 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index ea022ae34..251f2fc7d 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,7 +173,7 @@ jobs: run: | pwd ls - ${{ runner.workspace }}/powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From d4704e7bd45d7de17fd444c2a78c02176a0ac4a4 Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 16:30:25 +0200 Subject: [PATCH 083/118] Test_centos7_release_88 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 251f2fc7d..f5d7c2d5a 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,7 +173,7 @@ jobs: run: | pwd ls - powsybl-metrix/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From 534e0478c7d98ca5ce6b4448b20666ab24e162ca Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 16:35:54 +0200 Subject: [PATCH 084/118] Test_centos7_release_89 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f5d7c2d5a..c6f95a602 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,10 +173,10 @@ jobs: run: | pwd ls - build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - - name: Build - run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + # - name: Build + # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure From 5141adcc899755e2338ae83f538b09aabe1afcdf Mon Sep 17 00:00:00 2001 From: arnaud Date: Tue, 17 Oct 2023 17:49:23 +0200 Subject: [PATCH 085/118] Test_centos7_release_90 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index c6f95a602..db335e4b1 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -185,13 +185,12 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - name: Sonarcloud - working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + working-directory: ${{ runner.workspace }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - ${{ runner.workspace }}/sonar/bin/sonar-scanner - -Dsonar.host.url=https://sonarcloud.io + sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' From c392f1445647cfa999fe2b3eaebc4cf6afb1ed12 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 10:00:35 +0200 Subject: [PATCH 086/118] Test_centos7_release_91 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 5 ++++- .github/workflows/qa_pr_cpp_ubuntu.yml | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index db335e4b1..1747b532a 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -14,6 +14,9 @@ jobs: steps: - name: Install Dependancies run: | + echo $GITHUB_WORKSPACE + pwd + echo ${{ runner.workspace }} yum update -y yum install -y epel-release yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils @@ -185,7 +188,7 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - name: Sonarcloud - working-directory: ${{ runner.workspace }} + working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 709cbf5d2..8f742b9ef 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -1,8 +1,8 @@ name: QA-PR-CPP-UBUNTU on: - # pull_request: - # types: [opened, synchronize, edited] + pull_request: + types: [opened, synchronize, edited] release: types: [created, edited] @@ -13,6 +13,9 @@ jobs: steps: - name: Install Boost run: | + echo $GITHUB_WORKSPACE + pwd + echo ${{ runner.workspace }} sudo apt-get update -y sudo apt-get install -y libboost-all-dev From 959e92ef5c7446c2f24251d1015d7f1ba1a86416 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 10:12:25 +0200 Subject: [PATCH 087/118] Test_centos7_release_92 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 1747b532a..2836c4fe9 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -106,7 +106,7 @@ jobs: - name: Install Sonar wrapper - working-directory: ${{ runner.workspace }} + # working-directory: ${{ runner.workspace }} run: | echo ${{ runner.workspace }} pwd @@ -123,7 +123,7 @@ jobs: cd .. - name: Install Sonar scanner - working-directory: ${{ runner.workspace }} + # working-directory: ${{ runner.workspace }} run: | wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip @@ -172,7 +172,7 @@ jobs: cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build-Sonar - working-directory: ${{ runner.workspace }} + # working-directory: ${{ runner.workspace }} run: | pwd ls @@ -188,12 +188,12 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - name: Sonarcloud - working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + working-directory: $GITHUB_WORKSPACE/metrix-simulator env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io + $GITHUB_WORKSPACE/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' From a2a1109481b4ad3721b84d9a4df8f79d2c0af722 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 10:23:25 +0200 Subject: [PATCH 088/118] Test_centos7_release_93 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 2836c4fe9..a93afc86a 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -106,7 +106,7 @@ jobs: - name: Install Sonar wrapper - # working-directory: ${{ runner.workspace }} + working-directory: /home/runner/work/powsybl-metrix run: | echo ${{ runner.workspace }} pwd @@ -123,7 +123,7 @@ jobs: cd .. - name: Install Sonar scanner - # working-directory: ${{ runner.workspace }} + working-directory: /home/runner/work/powsybl-metrix run: | wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip @@ -172,11 +172,10 @@ jobs: cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - name: Build-Sonar - # working-directory: ${{ runner.workspace }} run: | pwd ls - build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + /home/runner/work/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install # - name: Build # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install @@ -193,7 +192,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - $GITHUB_WORKSPACE/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io + /home/runner/work/powsybl-metrix/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' From 0561dd39ffd938a123443923e6dbebca83e98d90 Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 13:51:23 +0200 Subject: [PATCH 089/118] Test_centos7_release_94 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index a93afc86a..fc163f1ad 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -106,7 +106,7 @@ jobs: - name: Install Sonar wrapper - working-directory: /home/runner/work/powsybl-metrix + working-directory: /__w/powsybl-metrix run: | echo ${{ runner.workspace }} pwd @@ -123,7 +123,7 @@ jobs: cd .. - name: Install Sonar scanner - working-directory: /home/runner/work/powsybl-metrix + working-directory: /__w/powsybl-metrix run: | wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip @@ -175,7 +175,7 @@ jobs: run: | pwd ls - /home/runner/work/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + /__w/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install # - name: Build # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install From 77cea7007e780d299ff30a5ec43187ec2318d19c Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 15:30:48 +0200 Subject: [PATCH 090/118] Test_centos7_release_95 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index fc163f1ad..e38dfc03e 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -173,6 +173,10 @@ jobs: - name: Build-Sonar run: | + cd .. + ls + echo "on retourne dans le dossier initial" + cd powsybl-metrix pwd ls /__w/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install @@ -192,7 +196,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - /home/runner/work/powsybl-metrix/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io + /__w/powsybl-metrix/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install if: github.event_name == 'release' From dc2c65f68e13c401d9f3a2045aec11ade429f6ed Mon Sep 17 00:00:00 2001 From: arnaud Date: Wed, 18 Oct 2023 16:56:42 +0200 Subject: [PATCH 091/118] Test_centos7_release_96 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index e38dfc03e..f8fce01ae 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -191,7 +191,7 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - name: Sonarcloud - working-directory: $GITHUB_WORKSPACE/metrix-simulator + # working-directory: $GITHUB_WORKSPACE/metrix-simulator env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 2e6d64bcede4a87fdaf5321ab0a0686ecf14e4fb Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 19 Oct 2023 10:19:00 +0200 Subject: [PATCH 092/118] Test_centos7_release_97 Signed-off-by: arnaud --- .github/workflows/maven_centos7.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven_centos7.yml b/.github/workflows/maven_centos7.yml index a05e4b9cc..46a140b6b 100644 --- a/.github/workflows/maven_centos7.yml +++ b/.github/workflows/maven_centos7.yml @@ -1,6 +1,12 @@ name: CI_centos7 -on: [release] +on: + push: + branches: + - 'main' + - 'release-v**' + - 'full-sonar-analysis-**' + pull_request: jobs: build: From dc1b9d3ce9d4dc2e4a33d4a0b689a7d2b1bc8f14 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 19 Oct 2023 13:23:15 +0200 Subject: [PATCH 093/118] Test_centos7_release_87 Signed-off-by: arnaud --- .../workflows/publish_artifact_centos7.yml | 75 ------------------- .github/workflows/qa_pr_cpp_centos7.yml | 5 ++ 2 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/publish_artifact_centos7.yml diff --git a/.github/workflows/publish_artifact_centos7.yml b/.github/workflows/publish_artifact_centos7.yml deleted file mode 100644 index 4710b53f8..000000000 --- a/.github/workflows/publish_artifact_centos7.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: publish_centos7 - -on: - workflow_dispatch: - -defaults: - run: - shell: bash - -jobs: - linux: - name: Linux - runs-on: ubuntu-latest - container: 'centos:centos7' - steps: - - name: Install Dependancies - run: | - yum update -y - yum install -y epel-release - yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils - yum install -y devtoolset-9 - - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.13 - with: - cmake-version: '3.22.x' - - - name: Checkout sources - uses: actions/checkout@v1 - - - name: Download Boost-release - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: 'ARnDOSrte/Boost' - file: 'boost_1_73_0.zip' - target: 'boost_1_73_0.zip' - token: ${{ secrets.TEST_TOKEN_RELEASE }} - - - name: Unzip Boost - run: unzip boost_1_73_0.zip - - - name: Configure 3rd parties - run: | - source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external - - - name: Build 3rd parties - run: | - cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7/external --parallel 2 - - - name: Configure CMake - run: | - source /opt/rh/devtoolset-9/enable - cmake -S $GITHUB_WORKSPACE/metrix-simulator -Wno-dev -DCMAKE_BUILD_TYPE=Release -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build-centos7/install -B $GITHUB_WORKSPACE/metrix-simulator/build-centos7 - - - name: Build - run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 - - # - name: Tests - # run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure - - - name: Prepare Metrix install - id: metrix-install - run: | - ARCHIVE_NAME="metrix-simulator-centos7.zip" - ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" - zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-centos7/install/bin/metrix-simulator - echo "::set-output name=archive_name::$ARCHIVE_NAME" - echo "::set-output name=archive_path::$ARCHIVE_PATH" - - - name: Upload OR-Tools install artifact - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.metrix-install.outputs.archive_name }} - path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index f8fce01ae..b7a56dba0 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -196,6 +196,11 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | + pwd + cd metrix-simulator + echo "on va dans metrix-simulator" + echo "on affiche le dossier" + ls /__w/powsybl-metrix/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install From 0b686c94029b5de7286cd4297965e34a43cb7803 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 19 Oct 2023 17:15:08 +0200 Subject: [PATCH 094/118] Test_centos7_release_98 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 2 +- .github/workflows/ci_ubuntu.yml | 147 ++++++++++++------------ .github/workflows/qa_pr_cpp_centos7.yml | 45 +------- .github/workflows/qa_pr_cpp_ubuntu.yml | 18 +-- 4 files changed, 82 insertions(+), 130 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 8df4e6411..2b62bffbc 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -2,7 +2,7 @@ name: CI-cpp-centos7 on: workflow_dispatch: {} - # push: {} + push: {} defaults: run: diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index eae115523..6617f9688 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -1,6 +1,8 @@ name: CI-cpp-ubuntu -on: [release] +on: + workflow_dispatch: {} + push: {} defaults: run: @@ -39,74 +41,75 @@ jobs: - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build-linux && ctest -j8 --output-on-failure - # qa: - # name: QA - CI - # runs-on: ubuntu-latest - # steps: - # - name: Install Java 11 - # uses: actions/setup-java@v1 - # with: - # java-version: 11 - - # - name: Install gcovr - # run: | - # sudo apt-get update -y - # sudo apt-get install -y gcovr - - # - name: Install Sonar wrapper - # working-directory: ${{ runner.workspace }} - # run: | - # wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip - # unzip build-wrapper-linux-x86.zip - - # - name: Install Sonar scanner - # working-directory: ${{ runner.workspace }} - # run: | - # wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar - # rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip - # env: - # SONAR_SCANNER_VERSION: 3.3.0.1492 - - # - name: Install Boost - # run: | - # sudo apt-get update -y - # sudo apt-get install -y libboost-all-dev - - # - name: Checkout sources - # uses: actions/checkout@v1 - - # - name: Configure 3rd parties - # run: > - # cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build/external - - # - name: Build 3rd parties - # run: > - # cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 - - # - name: Configure CMake - # run: > - # cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build - # -DCMAKE_BUILD_TYPE=Debug - # -DCODE_COVERAGE=TRUE - # -DMETRIX_RUN_ALL_TESTS=OFF - # -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - - # - name: Build - # run: > - # ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 - # --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output - # cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - - # - name: Tests - # run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure - - # - name: Sonarcloud - # working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - # run: > - # ${{ runner.workspace }}/sonar/bin/sonar-scanner - # -Dsonar.host.url=https://sonarcloud.io + qa: + name: QA - CI + runs-on: ubuntu-latest + if: (github.event_name == 'pull_request' && (github.event.action == "opened" || github.event.action == "ready-for-review")) || github.event_name == 'release' + steps: + - name: Install Java 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Install gcovr + run: | + sudo apt-get update -y + sudo apt-get install -y gcovr + + - name: Install Sonar wrapper + working-directory: ${{ runner.workspace }} + run: | + wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip + unzip build-wrapper-linux-x86.zip + + - name: Install Sonar scanner + working-directory: ${{ runner.workspace }} + run: | + wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + ln -s sonar-scanner-${SONAR_SCANNER_VERSION} sonar + rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip + env: + SONAR_SCANNER_VERSION: 3.3.0.1492 + + - name: Install Boost + run: | + sudo apt-get update -y + sudo apt-get install -y libboost-all-dev + + - name: Checkout sources + uses: actions/checkout@v1 + + - name: Configure 3rd parties + run: > + cmake -S $GITHUB_WORKSPACE/metrix-simulator/external -B $GITHUB_WORKSPACE/metrix-simulator/build/external + + - name: Build 3rd parties + run: > + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 + + - name: Configure CMake + run: > + cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build + -DCMAKE_BUILD_TYPE=Debug + -DCODE_COVERAGE=TRUE + -DMETRIX_RUN_ALL_TESTS=OFF + -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install + + - name: Build + run: > + ${{ runner.workspace }}/build-wrapper-linux-x86/build-wrapper-linux-x86-64 + --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output + cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install + + - name: Tests + run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure + + - name: Sonarcloud + working-directory: ${{ runner.workspace }}/powsybl-metrix/metrix-simulator + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: > + ${{ runner.workspace }}/sonar/bin/sonar-scanner + -Dsonar.host.url=https://sonarcloud.io diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index b7a56dba0..1cb1f165d 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-CENTOS7 on: pull_request: - types: [opened, synchronize, edited] + types: [opened, ready-for-review] release: types: [created, published, released] @@ -94,9 +94,6 @@ jobs: with: java-version: 11 - # - name: Install gcovr - # run: pip install gcovr - - name: Install gcovr run: | yum -y install libxml2-devel libxslt-devel @@ -108,19 +105,8 @@ jobs: - name: Install Sonar wrapper working-directory: /__w/powsybl-metrix run: | - echo ${{ runner.workspace }} - pwd wget https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip - ls - echo a1 - echo b1 - cd build-wrapper-linux-x86 - echo "On part dans build-wrapper-linux-x86" - ls - echo a2 - echo b2 - cd .. - name: Install Sonar scanner working-directory: /__w/powsybl-metrix @@ -154,36 +140,16 @@ jobs: - name: Build 3rd parties run: | cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 - - - name: Configure CMake (For Release) - if: github.event_name == 'release' - run: | - source /opt/rh/devtoolset-9/enable - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build - -DCMAKE_BUILD_TYPE=Debug - -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost - -DCODE_COVERAGE=TRUE - -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - - name: Configure CMake (For Pull Request) - if: github.event_name != 'release' + - name: Configure CMake run: | source /opt/rh/devtoolset-9/enable cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - - name: Build-Sonar + - name: Build run: | - cd .. - ls - echo "on retourne dans le dossier initial" - cd powsybl-metrix - pwd - ls /__w/powsybl-metrix/build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir $GITHUB_WORKSPACE/metrix-simulator/build/output cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - # - name: Build - # run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install - - name: Tests run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure @@ -191,16 +157,11 @@ jobs: run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage - name: Sonarcloud - # working-directory: $GITHUB_WORKSPACE/metrix-simulator env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: | - pwd cd metrix-simulator - echo "on va dans metrix-simulator" - echo "on affiche le dossier" - ls /__w/powsybl-metrix/sonar/bin/sonar-scanner -Dsonar.host.url=https://sonarcloud.io - name: Prepare Metrix install diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 8f742b9ef..6bf7c09bc 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -2,9 +2,9 @@ name: QA-PR-CPP-UBUNTU on: pull_request: - types: [opened, synchronize, edited] + types: [opened, ready-for-review] release: - types: [created, edited] + types: [created, published, released] jobs: clang-tidy: @@ -13,9 +13,6 @@ jobs: steps: - name: Install Boost run: | - echo $GITHUB_WORKSPACE - pwd - echo ${{ runner.workspace }} sudo apt-get update -y sudo apt-get install -y libboost-all-dev @@ -93,17 +90,8 @@ jobs: - name: Build 3rd parties run: > cmake --build $GITHUB_WORKSPACE/metrix-simulator/build/external --parallel 2 - - - name: Configure CMake (For Release) - if: github.event_name == 'release' - run: > - cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build - -DCMAKE_BUILD_TYPE=Debug - -DCODE_COVERAGE=TRUE - -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install - - name: Configure CMake (For Pull Request) - if: github.event_name != 'release' + - name: Configure CMake run: > cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug From 7599eb6226fbca68c6780b1d9c1c13bcc0e2500d Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 19 Oct 2023 17:27:24 +0200 Subject: [PATCH 095/118] Test_centos7_release_99 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 6617f9688..7a800ec8a 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -44,7 +44,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == 'pull_request' && (github.event.action == "opened" || github.event.action == "ready-for-review")) || github.event_name == 'release' + if: (github.event_name == 'pull_request' && (github.event.action == "opened" || github.event.payload.action == "ready-for-review")) || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 6ad479e03359255733b4aa3dd8ff9f917430a71e Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 19 Oct 2023 17:29:04 +0200 Subject: [PATCH 096/118] Test_centos7_release_100 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 7a800ec8a..64a5a1b3a 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -44,7 +44,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == 'pull_request' && (github.event.action == "opened" || github.event.payload.action == "ready-for-review")) || github.event_name == 'release' + if: (github.event_name == 'pull_request' && (github.event.payload.action == 'opened' || github.event.payload.action == 'ready-for-review')) || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 66c12c48d8c8c4e4e993f6cbd9548e403e9fc21a Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 09:57:58 +0200 Subject: [PATCH 097/118] Test_centos7_release_101 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- .github/workflows/qa_pr_cpp_ubuntu.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 64a5a1b3a..f726dd99c 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -44,7 +44,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == 'pull_request' && (github.event.payload.action == 'opened' || github.event.payload.action == 'ready-for-review')) || github.event_name == 'release' + if: (github.event_name == 'pull_request' && (github.event.payload.action == 'opened' || github.event.payload.action == 'review_requested')) || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 1cb1f165d..02ec0efa7 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-CENTOS7 on: pull_request: - types: [opened, ready-for-review] + types: [opened, synchronize, ready-for-review, review_requested] release: types: [created, published, released] diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 6bf7c09bc..d68b1b46a 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-UBUNTU on: pull_request: - types: [opened, ready-for-review] + types: [opened, synchronize, ready-for-review, review_requested] release: types: [created, published, released] From 15979b27192d1e1b598f0423791fbb96b5508235 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 10:00:06 +0200 Subject: [PATCH 098/118] Test_centos7_release_102 Signed-off-by: arnaud --- .github/workflows/qa_pr_cpp_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index d68b1b46a..57061fc07 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-UBUNTU on: pull_request: - types: [opened, synchronize, ready-for-review, review_requested] + # types: [opened, synchronize, ready-for-review, review_requested] release: types: [created, published, released] From 83926bfb27587a3c1587209dd42423f0e1d4a3cf Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 10:44:50 +0200 Subject: [PATCH 099/118] Test_centos7_release_103 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- .github/workflows/qa_pr_cpp_centos7.yml | 2 +- .github/workflows/qa_pr_cpp_ubuntu.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index f726dd99c..4e9d590ea 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -44,7 +44,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == 'pull_request' && (github.event.payload.action == 'opened' || github.event.payload.action == 'review_requested')) || github.event_name == 'release' + if: github.event.pull_request.draft == false || github.event.pull_request.opened || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml index 02ec0efa7..a27ef70b6 100644 --- a/.github/workflows/qa_pr_cpp_centos7.yml +++ b/.github/workflows/qa_pr_cpp_centos7.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-CENTOS7 on: pull_request: - types: [opened, synchronize, ready-for-review, review_requested] + types: [opened, ready_for_review] release: types: [created, published, released] diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml index 57061fc07..b1a695fa5 100644 --- a/.github/workflows/qa_pr_cpp_ubuntu.yml +++ b/.github/workflows/qa_pr_cpp_ubuntu.yml @@ -2,7 +2,7 @@ name: QA-PR-CPP-UBUNTU on: pull_request: - # types: [opened, synchronize, ready-for-review, review_requested] + types: [opened, ready_for_review] release: types: [created, published, released] From 7f4c6635dd74d12f3f64aa1479d93358d6d6f3fe Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 10:58:16 +0200 Subject: [PATCH 100/118] Test_centos7_release_104 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 4e9d590ea..cfcf0abd5 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -44,7 +44,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: github.event.pull_request.draft == false || github.event.pull_request.opened || github.event_name == 'release' + if: github.event.pull_request.ready_for_review || github.event.pull_request.opened || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 9a7c895ec9026a7788a6eb651ee068dfc068777d Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 11:22:38 +0200 Subject: [PATCH 101/118] Test_centos7_release_105 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 4 +++- .github/workflows/ci_ubuntu.yml | 4 +++- .github/workflows/maven_ubuntu.yml | 34 ++++++++++++++++++------------ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 2b62bffbc..9b1f77fa5 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -2,7 +2,9 @@ name: CI-cpp-centos7 on: workflow_dispatch: {} - push: {} + pull_request: + push: + release: defaults: run: diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index cfcf0abd5..8ac9a6647 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -2,7 +2,9 @@ name: CI-cpp-ubuntu on: workflow_dispatch: {} - push: {} + pull_request: + push: + release: defaults: run: diff --git a/.github/workflows/maven_ubuntu.yml b/.github/workflows/maven_ubuntu.yml index dda0ef3a0..fd67e650c 100644 --- a/.github/workflows/maven_ubuntu.yml +++ b/.github/workflows/maven_ubuntu.yml @@ -1,6 +1,12 @@ -name: CI_ubuntu +name: CI-UBUNTU -on: [release] +on: + push: + branches: + - 'main' + - 'release-v**' + - 'full-sonar-analysis-**' + pull_request: jobs: build: @@ -11,10 +17,10 @@ jobs: os: [ubuntu-latest] steps: - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Checkout sources uses: actions/checkout@v1 @@ -22,14 +28,14 @@ jobs: - name: Build with Maven run: mvn --batch-mode package - # - name: Run SonarCloud analysis - # if: matrix.os == 'ubuntu-latest' - # run: > - # mvn --batch-mode -Pjacoco verify sonar:sonar - # -Dsonar.host.url=https://sonarcloud.io - # -Dsonar.organization=powsybl-ci-github - # -Dsonar.projectKey=com.powsybl:powsybl-metrix - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Run SonarCloud analysis + if: matrix.os == 'ubuntu-latest' + run: > + mvn --batch-mode -Pjacoco verify sonar:sonar + -Dsonar.host.url=https://sonarcloud.io + -Dsonar.organization=powsybl-ci-github + -Dsonar.projectKey=com.powsybl:powsybl-metrix + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From d6a9076cde3cc17d42fd0762996a87d208211880 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 11:47:53 +0200 Subject: [PATCH 102/118] Test_centos7_release_106 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 8ac9a6647..98fe7235f 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -46,7 +46,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: github.event.pull_request.ready_for_review || github.event.pull_request.opened || github.event_name == 'release' + if: (github.event_name == "pull_request" && (github.event.action == "ready_for_review" || github.event.action == "opened")) || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 2a6f13f467fbf4321b7ad6bbe79ebc9b0aa70c31 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 11:48:45 +0200 Subject: [PATCH 103/118] Test_centos7_release_107 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 98fe7235f..b737a01cf 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -46,7 +46,7 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == "pull_request" && (github.event.action == "ready_for_review" || github.event.action == "opened")) || github.event_name == 'release' + if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' steps: - name: Install Java 11 uses: actions/setup-java@v1 From a603bbce5f02ec633048f3171763f6082f23e028 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:03:19 +0200 Subject: [PATCH 104/118] Test_centos7_release_108 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index b737a01cf..abd97a69e 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -46,7 +46,8 @@ jobs: qa: name: QA - CI runs-on: ubuntu-latest - if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' + # if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' + if: github.event_name == 'pull_request' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 771fc153dafd64b074922814ce76cae2837cf1d4 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:05:21 +0200 Subject: [PATCH 105/118] Test_centos7_release_109 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index abd97a69e..ac02381c2 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -47,7 +47,7 @@ jobs: name: QA - CI runs-on: ubuntu-latest # if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' - if: github.event_name == 'pull_request' + if: github.event_name == 'pull_request' && github.event.action == 'ready_for_review' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 8ed3f6e99870482eb6a8ed9a06bc0fbe5646c4a5 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:09:27 +0200 Subject: [PATCH 106/118] Test_centos7_release_110 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index ac02381c2..346e5ed03 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -2,7 +2,7 @@ name: CI-cpp-ubuntu on: workflow_dispatch: {} - pull_request: + pull_request: [opened, ready_for_review] push: release: From 6fc20ce46aff6059dade073f2809cc8ea308e443 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:14:10 +0200 Subject: [PATCH 107/118] Test_centos7_release_111 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 346e5ed03..e9c93a274 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -2,7 +2,8 @@ name: CI-cpp-ubuntu on: workflow_dispatch: {} - pull_request: [opened, ready_for_review] + pull_request: + types: [opened, ready_for_review] push: release: @@ -47,7 +48,7 @@ jobs: name: QA - CI runs-on: ubuntu-latest # if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' - if: github.event_name == 'pull_request' && github.event.action == 'ready_for_review' + # if: github.event_name == 'pull_request' && github.event.action == 'ready_for_review' steps: - name: Install Java 11 uses: actions/setup-java@v1 From 7df8bbcfa74976eb670ee2b9ea4909c3660adaa2 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:22:42 +0200 Subject: [PATCH 108/118] Test_centos7_release_112 Signed-off-by: arnaud --- metrix-simulator/src/metrix2assess.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index f31bba507..2aa33a2df 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1628,7 +1628,7 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, LOG_ALL(warning) << "probleme lors de la restitution des variations marginales " << typeEtat_[numVar]; } - + } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B From 2b9fd038c9a03175a9997db1645a169576297d89 Mon Sep 17 00:00:00 2001 From: arnaud Date: Fri, 20 Oct 2023 12:26:53 +0200 Subject: [PATCH 109/118] Test_centos7_release_113 Signed-off-by: arnaud --- metrix-simulator/src/metrix2assess.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp index 2aa33a2df..f31bba507 100644 --- a/metrix-simulator/src/metrix2assess.cpp +++ b/metrix-simulator/src/metrix2assess.cpp @@ -1628,7 +1628,7 @@ bool Calculer::computeCosts(const std::vector& constraintsToDelail, LOG_ALL(warning) << "probleme lors de la restitution des variations marginales " << typeEtat_[numVar]; } - + } else if (typeOu[j] == 4) { // curatif if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B From e6b94f38287890d7c2d44c4caf96823a2798186b Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 26 Oct 2023 14:37:10 +0200 Subject: [PATCH 110/118] Test_centos7_release_114 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 9b1f77fa5..cbf9c66a1 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -68,7 +68,8 @@ jobs: run: | ARCHIVE_NAME="metrix-simulator-centos7.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" - zip $ARCHIVE_PATH /__w/powsybl-metrix/powsybl-metrix/metrix-simulator/build-centos7/install/bin/metrix-simulator + cd metrix-simulator/build-centos7/install/ + zip $ARCHIVE_NAME bin etc echo "::set-output name=archive_name::$ARCHIVE_NAME" echo "::set-output name=archive_path::$ARCHIVE_PATH" @@ -77,4 +78,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ steps.metrix-install.outputs.archive_name }} - path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file + path: ${{ steps.metrix-install.outputs.archive_name }} \ No newline at end of file From 7531c2bff0448fb482eb124d671dc9a382b82d18 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 26 Oct 2023 14:49:12 +0200 Subject: [PATCH 111/118] Test_centos7_release_115 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index cbf9c66a1..cb0ca4115 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -59,11 +59,11 @@ jobs: - name: Build run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build-centos7 --target install --parallel 2 - - name: Tests - run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure + # - name: Tests + # run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure - name: Prepare Metrix install - if: github.event_name == 'workflow_dispatch' + # if: github.event_name == 'workflow_dispatch' id: metrix-install run: | ARCHIVE_NAME="metrix-simulator-centos7.zip" @@ -74,7 +74,7 @@ jobs: echo "::set-output name=archive_path::$ARCHIVE_PATH" - name: Upload OR-Tools install artifact - if: github.event_name == 'workflow_dispatch' + # if: github.event_name == 'workflow_dispatch' uses: actions/upload-artifact@v3 with: name: ${{ steps.metrix-install.outputs.archive_name }} From 404dd8785579a5c1f638b96e9a94b098e1b40c5d Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 26 Oct 2023 15:07:00 +0200 Subject: [PATCH 112/118] Test_centos7_release_116 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index cb0ca4115..d2193b659 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -69,7 +69,8 @@ jobs: ARCHIVE_NAME="metrix-simulator-centos7.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" cd metrix-simulator/build-centos7/install/ - zip $ARCHIVE_NAME bin etc + zip $ARCHIVE_PATH bin etc + cd ../../.. echo "::set-output name=archive_name::$ARCHIVE_NAME" echo "::set-output name=archive_path::$ARCHIVE_PATH" @@ -78,4 +79,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ steps.metrix-install.outputs.archive_name }} - path: ${{ steps.metrix-install.outputs.archive_name }} \ No newline at end of file + path: ${{ steps.metrix-install.outputs.archive_path }} \ No newline at end of file From 9262f353a55df9b12370f01b5a7712e06e597037 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 26 Oct 2023 15:14:59 +0200 Subject: [PATCH 113/118] Test_centos7_release_117 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index d2193b659..92f88997c 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -69,7 +69,14 @@ jobs: ARCHIVE_NAME="metrix-simulator-centos7.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" cd metrix-simulator/build-centos7/install/ - zip $ARCHIVE_PATH bin etc + ls + cd bin + ls + cd .. + cd etc + ls + cd .. + zip -r $ARCHIVE_PATH bin etc cd ../../.. echo "::set-output name=archive_name::$ARCHIVE_NAME" echo "::set-output name=archive_path::$ARCHIVE_PATH" From 1096acc6cbd9edee8ece40c06bd2740222ae1c85 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 26 Oct 2023 15:28:31 +0200 Subject: [PATCH 114/118] Test_centos7_release_118 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 92f88997c..90b131b25 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -69,15 +69,7 @@ jobs: ARCHIVE_NAME="metrix-simulator-centos7.zip" ARCHIVE_PATH="$PWD/${ARCHIVE_NAME}" cd metrix-simulator/build-centos7/install/ - ls - cd bin - ls - cd .. - cd etc - ls - cd .. zip -r $ARCHIVE_PATH bin etc - cd ../../.. echo "::set-output name=archive_name::$ARCHIVE_NAME" echo "::set-output name=archive_path::$ARCHIVE_PATH" From 93725d76403f0a88a6def9c16faeea3005baf45b Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 2 Nov 2023 09:36:17 +0100 Subject: [PATCH 115/118] Test_centos7_release_119 Signed-off-by: arnaud --- .github/workflows/ci_centos7.yml | 4 ++-- .github/workflows/ci_ubuntu.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_centos7.yml b/.github/workflows/ci_centos7.yml index 90b131b25..fabe39f45 100644 --- a/.github/workflows/ci_centos7.yml +++ b/.github/workflows/ci_centos7.yml @@ -63,7 +63,7 @@ jobs: # run: cd $GITHUB_WORKSPACE/metrix-simulator/build-centos7 && ctest -j2 --output-on-failure - name: Prepare Metrix install - # if: github.event_name == 'workflow_dispatch' + if: github.event_name == 'workflow_dispatch' id: metrix-install run: | ARCHIVE_NAME="metrix-simulator-centos7.zip" @@ -74,7 +74,7 @@ jobs: echo "::set-output name=archive_path::$ARCHIVE_PATH" - name: Upload OR-Tools install artifact - # if: github.event_name == 'workflow_dispatch' + if: github.event_name == 'workflow_dispatch' uses: actions/upload-artifact@v3 with: name: ${{ steps.metrix-install.outputs.archive_name }} diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index e9c93a274..a8081a862 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -3,7 +3,7 @@ name: CI-cpp-ubuntu on: workflow_dispatch: {} pull_request: - types: [opened, ready_for_review] + # types: [opened, ready_for_review] push: release: @@ -18,6 +18,7 @@ jobs: steps: - name: Install Boost run: | + sudo apt-get update -y sudo apt-get install -y libboost-all-dev @@ -48,7 +49,7 @@ jobs: name: QA - CI runs-on: ubuntu-latest # if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' - # if: github.event_name == 'pull_request' && github.event.action == 'ready_for_review' + if: ${{(github.event_name == 'pull_request' && github.event.action == 'ready_for_review') || (github.event_name == 'pull_request' && github.event.action == 'opened') }} steps: - name: Install Java 11 uses: actions/setup-java@v1 From 61b4c571261606e039a68811c228e344f2fb6497 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 2 Nov 2023 09:52:45 +0100 Subject: [PATCH 116/118] Test_centos7_release_120 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index a8081a862..83e7ae161 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -49,7 +49,9 @@ jobs: name: QA - CI runs-on: ubuntu-latest # if: (github.event_name == 'pull_request' && (github.event.action == 'ready_for_review' || github.event.action == 'opened')) || github.event_name == 'release' - if: ${{(github.event_name == 'pull_request' && github.event.action == 'ready_for_review') || (github.event_name == 'pull_request' && github.event.action == 'opened') }} + if: | + (github.event_name == 'pull_request' && github.event.action == 'ready_for_review') || + (github.event_name == 'pull_request' && github.event.action == 'opened') steps: - name: Install Java 11 uses: actions/setup-java@v1 From d965bfec0b9297d3a9ae1ece393a9f18e77e7459 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 2 Nov 2023 10:01:54 +0100 Subject: [PATCH 117/118] Test_centos7_release_121 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 83e7ae161..3fda813ee 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Install Boost run: | - + echo "${{ github.event.action }}" sudo apt-get update -y sudo apt-get install -y libboost-all-dev From 8d35c2433a619372e132705577b873bc743e1154 Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 2 Nov 2023 10:05:54 +0100 Subject: [PATCH 118/118] Test_centos7_release_122 Signed-off-by: arnaud --- .github/workflows/ci_ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 3fda813ee..3b6422929 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -3,7 +3,7 @@ name: CI-cpp-ubuntu on: workflow_dispatch: {} pull_request: - # types: [opened, ready_for_review] + types: [opened, synchronize, ready_for_review] push: release: