From c82c0d18629af860339e58aafaaccfe51fb7f100 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 8 Nov 2023 23:48:02 +0100 Subject: [PATCH 01/64] my first workflow --- .github/workflows/createBundle.yml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 56e469f..ae15f01 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [ "main", "release/*" ] + branches: [ "main", "release/*" , "tests-*"] # tags: ["v*"] pull_request: branches: [ "main", "release/*" ] @@ -168,6 +168,33 @@ jobs: name: ctrlppcheck path: ${{github.workspace}}/build/${{ matrix.config.artifact }} + tests: + name: WinCC OA tests + runs-on: windows-2019 + needs: build + + steps: + - uses: actions/checkout@v3 + + - name: Prepare file structure and project + run: | + mkdir -p ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck + + - name: Download ctrlppcheck binaries + uses: actions/download-artifact@v3 + with: + name: ctrlppcheck + path: ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck/ + + - name: Start WinCC OA tests + run: | + cd ${{ github.workspace }}/devTools && executeTests.cmd + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v4 + with: + report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml + package: name: Package project and binaries runs-on: ubuntu-20.04 From 9e50630e4c6e7cce95e5ab417f764a2c5fb1829b Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 8 Nov 2023 23:54:06 +0100 Subject: [PATCH 02/64] echo --- .github/workflows/createBundle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ae15f01..6be5f6b 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -188,7 +188,10 @@ jobs: - name: Start WinCC OA tests run: | - cd ${{ github.workspace }}/devTools && executeTests.cmd + dir + cd ${{ github.workspace }}/devTools + dir + executeTests.cmd - name: Publish Test Report uses: mikepenz/action-junit-report@v4 From aa34b2e32dba36a30055777385ca9e2c2d9349f4 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Thu, 9 Nov 2023 00:00:44 +0100 Subject: [PATCH 03/64] cmd --- .github/workflows/createBundle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6be5f6b..66713d6 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -192,6 +192,7 @@ jobs: cd ${{ github.workspace }}/devTools dir executeTests.cmd + shell: cmd - name: Publish Test Report uses: mikepenz/action-junit-report@v4 From c5765e4fe54603794bf759df2a3d8c6c0afd7be2 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Thu, 9 Nov 2023 00:24:38 +0100 Subject: [PATCH 04/64] e --- .github/workflows/createBundle.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 66713d6..29d1992 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -176,7 +176,7 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Prepare file structure and project + - name: Prepare tests run: | mkdir -p ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck @@ -188,9 +188,7 @@ jobs: - name: Start WinCC OA tests run: | - dir cd ${{ github.workspace }}/devTools - dir executeTests.cmd shell: cmd From c46d44653372aae34c02c9ed7d124466626e5b38 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Fri, 24 Nov 2023 23:14:15 +0100 Subject: [PATCH 05/64] docker --- .github/workflows/createBundle.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 29d1992..83b5498 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -170,10 +170,20 @@ jobs: tests: name: WinCC OA tests - runs-on: windows-2019 + runs-on: Ubuntu 2004 GCC + container: + image: ghcr.io/agruberetm/winccoa:v3.19.7-server + credentials: + username: mPokornyETM + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} needs: build steps: + - name: who-am-i + shell: bash + run: | + echo "--This is running in my custom Docker image--" + uname - uses: actions/checkout@v3 - name: Prepare tests From dab31a96dc1d20d5212e7bbf288b8d52490d4e11 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Fri, 24 Nov 2023 23:25:44 +0100 Subject: [PATCH 06/64] an other try --- .github/workflows/createBundle.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 83b5498..78d7b8e 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -171,11 +171,11 @@ jobs: tests: name: WinCC OA tests runs-on: Ubuntu 2004 GCC - container: - image: ghcr.io/agruberetm/winccoa:v3.19.7-server - credentials: - username: mPokornyETM - password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} +# container: +# image: ghcr.io/agruberetm/winccoa:v3.19.7-server +# credentials: +# username: mPokornyETM +# password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} needs: build steps: @@ -199,8 +199,8 @@ jobs: - name: Start WinCC OA tests run: | cd ${{ github.workspace }}/devTools - executeTests.cmd - shell: cmd + # executeTests.cmd + # shell: cmd - name: Publish Test Report uses: mikepenz/action-junit-report@v4 @@ -210,7 +210,7 @@ jobs: package: name: Package project and binaries runs-on: ubuntu-20.04 - needs: build + needs: [build, tests] steps: - uses: actions/checkout@v3 From 19d8718abed61f70a90b65df85e237f5df914470 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Fri, 24 Nov 2023 23:27:53 +0100 Subject: [PATCH 07/64] on --- .github/workflows/createBundle.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 78d7b8e..6a344bc 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -170,12 +170,12 @@ jobs: tests: name: WinCC OA tests - runs-on: Ubuntu 2004 GCC -# container: -# image: ghcr.io/agruberetm/winccoa:v3.19.7-server -# credentials: -# username: mPokornyETM -# password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} + runs-on: ubuntu-20.04 + container: + image: ghcr.io/agruberetm/winccoa:v3.19.7-server + credentials: + username: mPokornyETM + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} needs: build steps: From 31cc8166ca423ac5cd06c4e2584cb9bbfd5aa360 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Fri, 24 Nov 2023 23:30:02 +0100 Subject: [PATCH 08/64] uiserver --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6a344bc..4af55fa 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: WinCC OA tests runs-on: ubuntu-20.04 container: - image: ghcr.io/agruberetm/winccoa:v3.19.7-server + image: ghcr.io/agruberetm/winccoa:v3.19.7-uiserver credentials: username: mPokornyETM password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} From 58c4f2ca81ca16c7ac481e8f8c10042d4c68dd6f Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 21:41:05 +0100 Subject: [PATCH 09/64] use my image --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 4af55fa..011f32e 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: WinCC OA tests runs-on: ubuntu-20.04 container: - image: ghcr.io/agruberetm/winccoa:v3.19.7-uiserver + image: ghcr.io/mpokornyetm/winccoa:v3.19.7-uiserver credentials: username: mPokornyETM password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} From 7a2e82bec29324c1121dea1842590f2116248c3a Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 21:47:03 +0100 Subject: [PATCH 10/64] own image --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 011f32e..e5ea377 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: WinCC OA tests runs-on: ubuntu-20.04 container: - image: ghcr.io/mpokornyetm/winccoa:v3.19.7-uiserver + image: mpokornyetm/winccoa:v3.19.7-uiserver credentials: username: mPokornyETM password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} From 1f95b45fb39a970cfc954f8d90e0839ef4c7270f Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 21:50:49 +0100 Subject: [PATCH 11/64] mpokornyetm --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index e5ea377..a1dd5a8 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -174,7 +174,7 @@ jobs: container: image: mpokornyetm/winccoa:v3.19.7-uiserver credentials: - username: mPokornyETM + username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} needs: build From c0c62ee0ebadd8aad4bf069e3ba94d65f1296688 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 22:00:10 +0100 Subject: [PATCH 12/64] oa version --- .github/workflows/createBundle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index a1dd5a8..c184501 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -184,6 +184,7 @@ jobs: run: | echo "--This is running in my custom Docker image--" uname + cd /opt/WinCC_OA/3.19/bin/ && ./WCCOActrl -version - uses: actions/checkout@v3 - name: Prepare tests From 8f6650ca16a56af21b291ad58f3360568aefc5f1 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 22:07:59 +0100 Subject: [PATCH 13/64] WCCOActrl -versio --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index c184501..c4c2ec7 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -184,7 +184,7 @@ jobs: run: | echo "--This is running in my custom Docker image--" uname - cd /opt/WinCC_OA/3.19/bin/ && ./WCCOActrl -version + cd /opt/WinCC_OA/3.19/bin/ && ./WCCOActrl -version || true - uses: actions/checkout@v3 - name: Prepare tests From 07f0b45f4cbad2c43d5b5e91381a8a9148e9e3cd Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 22:12:53 +0100 Subject: [PATCH 14/64] root --- .github/workflows/createBundle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index c4c2ec7..dd2034a 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -173,6 +173,7 @@ jobs: runs-on: ubuntu-20.04 container: image: mpokornyetm/winccoa:v3.19.7-uiserver + options: --user root credentials: username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} From ce4b767a8b989dca1c09686a020f71914934eb4a Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 22:18:23 +0100 Subject: [PATCH 15/64] echo --- .github/workflows/createBundle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index dd2034a..8af16c6 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -190,6 +190,7 @@ jobs: - name: Prepare tests run: | + ls -la ${{github.workspace}} mkdir -p ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck - name: Download ctrlppcheck binaries @@ -200,6 +201,8 @@ jobs: - name: Start WinCC OA tests run: | + ls -la ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck/ + ls -la ${{github.workspace}} cd ${{ github.workspace }}/devTools # executeTests.cmd # shell: cmd From e6dd5a9e677c358fd29082315353f4857a25bcb0 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Tue, 12 Dec 2023 23:06:30 +0100 Subject: [PATCH 16/64] next try --- .github/workflows/createBundle.yml | 113 +++++++++++++++++++---------- 1 file changed, 75 insertions(+), 38 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 8af16c6..35c29f0 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -158,16 +158,48 @@ jobs: # no ctest tests for modified cppcheck, they were just thrown away #- name: Test # working-directory: ${{github.workspace}}/build - # # Execute tests defined by the CMake configuration. + # # Execute tests defined by the CMake configuration. # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail # run: ctest -C ${{env.BUILD_TYPE}} - + - name: Upload ctrlppcheck uses: actions/upload-artifact@v3 with: name: ctrlppcheck path: ${{github.workspace}}/build/${{ matrix.config.artifact }} + package: + name: Package project and binaries + runs-on: ubuntu-20.04 + needs: build + + steps: + - uses: actions/checkout@v3 + + - name: Prepare file structure and project + run: | + mkdir -p ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck + cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck/ctrlppcheck + cp -rp ${{github.workspace}}/WinCC_OA_Test/* ${{github.workspace}}/tests/WinCC_OA_Test/ + + - name: Download ctrlppcheck binaries + uses: actions/download-artifact@v3 + with: + name: ctrlppcheck + path: ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck/ + + - name: Upload WinCCOA_QualityChecks + uses: actions/upload-artifact@v3 + with: + name: WinCCOA_QualityChecks + path: ${{github.workspace}}/install/* + + - name: Upload WinCC_OA_Test + uses: actions/upload-artifact@v3 + with: + name: WinCC_OA_Test + path: ${{github.workspace}}/tests/* + tests: name: WinCC OA tests runs-on: ubuntu-20.04 @@ -177,7 +209,7 @@ jobs: credentials: username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} - needs: build + needs: [build, package] steps: - name: who-am-i @@ -186,56 +218,61 @@ jobs: echo "--This is running in my custom Docker image--" uname cd /opt/WinCC_OA/3.19/bin/ && ./WCCOActrl -version || true - - uses: actions/checkout@v3 - - name: Prepare tests - run: | - ls -la ${{github.workspace}} - mkdir -p ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck + - name: Download WinCCOA_QualityChecks package + uses: actions/download-artifact@v3 + with: + name: WinCCOA_QualityChecks + path: ${{github.workspace}}/WinCCOA_QualityChecks/ - - name: Download ctrlppcheck binaries + - name: Download WinCC_OA_Test uses: actions/download-artifact@v3 with: - name: ctrlppcheck - path: ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck/ + name: WinCC_OA_Test + path: ${{github.workspace}}/WinCC_OA_Test/ - - name: Start WinCC OA tests + - name: Register Ctrl TestFramework run: | - ls -la ${{github.workspace}}/WinCCOA_QualityChecks/bin/ctrlppcheck/ ls -la ${{github.workspace}} - cd ${{ github.workspace }}/devTools - # executeTests.cmd - # shell: cmd - - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 - with: - report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml + echo "[general] + pvss_path = \"/opt/WinCC_OA/3.19\" + proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" + proj_path = \"${{github.workspace}}/WinCC_OA_Test/Projects/Global\" + proj_path = \"${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG\" + proj_version = \"3.19\" + langs = \"de_AT.utf8\" + langs = \"en_US.utf8\" + langs = \"ru_RU.utf8\" + pmonPort = 5999 + [testFramework] + installPath = \"${{github.workspace}}/WinCC_OA_Test/\" + " > ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/config/config - package: - name: Package project and binaries - runs-on: ubuntu-20.04 - needs: [build, tests] + mkdir -p ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/log - steps: - - uses: actions/checkout@v3 + /opt/WinCC_OA/3.19/bin/WCCILpmon -config ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status + RC=$? + if [ "$RC" '!=' "0" ]; then + echo "RC=$RC" + exit 0 + fi; - - name: Prepare file structure and project + - name: Start WinCC OA tests run: | - mkdir -p ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck - cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/ + echo ****** Execute WinCC OA Tests + /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -config %WINCC_OA_TEST_PATH%Projects\TfCustomizedQG\config\config -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 - - name: Download ctrlppcheck binaries - uses: actions/download-artifact@v3 - with: - name: ctrlppcheck - path: ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck/ + - name: Convert WinCC OA tests to jUnit + run: | + echo ****** Convert results into jUnit format + /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -config %WINCC_OA_TEST_PATH%Projects\TfCustomizedQG\config\config -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - - name: Upload WinCCOA_QualityChecks - uses: actions/upload-artifact@v3 + + - name: Publish Test Report + uses: mikepenz/action-junit-report@v4 with: - name: WinCCOA_QualityChecks - path: ${{github.workspace}}/install/* + report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml release: if: github.event_name == 'release' From 644b76146a849cb7cd9a9117c2ac84e954372cb3 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 01:39:58 +0100 Subject: [PATCH 17/64] Prepare file structure and project --- .github/workflows/createBundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 35c29f0..299a10c 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -179,7 +179,7 @@ jobs: - name: Prepare file structure and project run: | mkdir -p ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck - cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck/ctrlppcheck + cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/ cp -rp ${{github.workspace}}/WinCC_OA_Test/* ${{github.workspace}}/tests/WinCC_OA_Test/ - name: Download ctrlppcheck binaries @@ -274,7 +274,7 @@ jobs: with: report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml - release: + tests: if: github.event_name == 'release' name: Release runs-on: ubuntu-20.04 From 25a287d89315652cc7380568ef7417e2a0467c95 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 01:42:18 +0100 Subject: [PATCH 18/64] release --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 299a10c..13b54bd 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -274,7 +274,7 @@ jobs: with: report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml - tests: + release: if: github.event_name == 'release' name: Release runs-on: ubuntu-20.04 From a2525158f458eb9416c0d9d1e09d4ece0f920fd0 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 01:48:09 +0100 Subject: [PATCH 19/64] mkdir --- .github/workflows/createBundle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 13b54bd..d60e7fe 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -180,6 +180,7 @@ jobs: run: | mkdir -p ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/ + mkdir -p ${{github.workspace}}/tests/WinCC_OA_Test/ cp -rp ${{github.workspace}}/WinCC_OA_Test/* ${{github.workspace}}/tests/WinCC_OA_Test/ - name: Download ctrlppcheck binaries From 3487dcb523f0fea519beea5da123cb576c4ad2f4 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 01:55:35 +0100 Subject: [PATCH 20/64] foo --- .github/workflows/createBundle.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index d60e7fe..a5398ae 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -213,12 +213,10 @@ jobs: needs: [build, package] steps: - - name: who-am-i + - name: Print WinCC OA version shell: bash run: | - echo "--This is running in my custom Docker image--" - uname - cd /opt/WinCC_OA/3.19/bin/ && ./WCCOActrl -version || true + /opt/WinCC_OA/3.19/bin/WCCOActrl -version || true - name: Download WinCCOA_QualityChecks package uses: actions/download-artifact@v3 @@ -234,7 +232,7 @@ jobs: - name: Register Ctrl TestFramework run: | - ls -la ${{github.workspace}} + ls -la ${{github.workspace}}/ || true echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" From 004968cf26adced4c4704c315a3b5676614062cb Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:03:09 +0100 Subject: [PATCH 21/64] echo --- .github/workflows/createBundle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index a5398ae..6634a3a 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -232,7 +232,8 @@ jobs: - name: Register Ctrl TestFramework run: | - ls -la ${{github.workspace}}/ || true + pwd + ls -la || true echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" @@ -277,7 +278,7 @@ jobs: if: github.event_name == 'release' name: Release runs-on: ubuntu-20.04 - needs: package + needs: tests steps: - name: Get the version From ac7eec1a2c7e69b5690e805c466c98c7479ee8b9 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:13:37 +0100 Subject: [PATCH 22/64] Register Ctrl TestFramework --- .github/workflows/createBundle.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6634a3a..9c34b26 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -238,20 +238,20 @@ jobs: echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" - proj_path = \"${{github.workspace}}/WinCC_OA_Test/Projects/Global\" - proj_path = \"${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG\" + proj_path = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/Global\" + proj_path = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG\" proj_version = \"3.19\" langs = \"de_AT.utf8\" langs = \"en_US.utf8\" langs = \"ru_RU.utf8\" pmonPort = 5999 [testFramework] - installPath = \"${{github.workspace}}/WinCC_OA_Test/\" - " > ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/config/config + installPath = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/\" + " > /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config - mkdir -p ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/log + mkdir -p $/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCILpmon -config ${{github.workspace}}/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status + /opt/WinCC_OA/3.19/bin/WCCILpmon -config /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status RC=$? if [ "$RC" '!=' "0" ]; then echo "RC=$RC" @@ -268,7 +268,6 @@ jobs: echo ****** Convert results into jUnit format /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -config %WINCC_OA_TEST_PATH%Projects\TfCustomizedQG\config\config -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: From 4439d6a8238cbe073b20d30fa626c3afdf9f21ed Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:14:27 +0100 Subject: [PATCH 23/64] proj --- .github/workflows/createBundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 9c34b26..9e4fd82 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -261,12 +261,12 @@ jobs: - name: Start WinCC OA tests run: | echo ****** Execute WinCC OA Tests - /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -config %WINCC_OA_TEST_PATH%Projects\TfCustomizedQG\config\config -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 + /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 - name: Convert WinCC OA tests to jUnit run: | echo ****** Convert results into jUnit format - /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -config %WINCC_OA_TEST_PATH%Projects\TfCustomizedQG\config\config -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 + /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - name: Publish Test Report uses: mikepenz/action-junit-report@v4 From 492a820b4efa36d6f0d36876ca36cec279c01790 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:22:01 +0100 Subject: [PATCH 24/64] echos --- .github/workflows/createBundle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 9e4fd82..b84778e 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -234,6 +234,10 @@ jobs: run: | pwd ls -la || true + ls -la __w/CtrlppCheck/CtrlppCheck/ || true + ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/ || true + ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/ || true + ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/ || true echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" From 95e14ee4969c08ceda026ddcb424d3195a9a77b5 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:27:52 +0100 Subject: [PATCH 25/64] sudo --- .github/workflows/createBundle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index b84778e..c701628 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -232,6 +232,7 @@ jobs: - name: Register Ctrl TestFramework run: | + whoami pwd ls -la || true ls -la __w/CtrlppCheck/CtrlppCheck/ || true @@ -239,7 +240,7 @@ jobs: ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/ || true ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/ || true - echo "[general] + sudo echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" proj_path = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/Global\" @@ -253,7 +254,7 @@ jobs: installPath = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/\" " > /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config - mkdir -p $/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/log + sudo mkdir -p $/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/log /opt/WinCC_OA/3.19/bin/WCCILpmon -config /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status RC=$? From 1c9bf931a93fe8314e3da00a8c015bceb5f12a78 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 02:37:44 +0100 Subject: [PATCH 26/64] opt --- .github/workflows/createBundle.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index c701628..19b937c 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -235,28 +235,31 @@ jobs: whoami pwd ls -la || true - ls -la __w/CtrlppCheck/CtrlppCheck/ || true - ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/ || true - ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/ || true - ls -la __w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/ || true - sudo echo "[general] + mv -rf WinCC_OA_Test/ /opt/ + + ls -la /opt/ || true + ls -la /opt/WinCC_OA_Test/ || true + ls -la /opt/WinCC_OA_Test/Projects/ || true + ls -la /opt/WinCC_OA_Test/Projects/TfCustomizedQG/ || true + + echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" - proj_path = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/Global\" - proj_path = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG\" + proj_path = \"/opt/WinCC_OA_Test/Projects/Global\" + proj_path = \"/opt/WinCC_OA_Test/Projects/TfCustomizedQG\" proj_version = \"3.19\" langs = \"de_AT.utf8\" langs = \"en_US.utf8\" langs = \"ru_RU.utf8\" pmonPort = 5999 [testFramework] - installPath = \"/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/\" - " > /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config + installPath = \"/opt/WinCC_OA_Test/\" + " > /opt/WinCC_OA_Test/Projects/TfCustomizedQG/config/config - sudo mkdir -p $/__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/log + mkdir -p $/opt/WinCC_OA_Test/Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCILpmon -config /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status + /opt/WinCC_OA/3.19/bin/WCCILpmon -config /opt/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status RC=$? if [ "$RC" '!=' "0" ]; then echo "RC=$RC" From 18e973375121022c026bd531b5fc57dd0d2df714 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 10:37:59 +0100 Subject: [PATCH 27/64] no root --- .github/workflows/createBundle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 19b937c..7431671 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -206,7 +206,7 @@ jobs: runs-on: ubuntu-20.04 container: image: mpokornyetm/winccoa:v3.19.7-uiserver - options: --user root +# options: --user root credentials: username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} @@ -235,6 +235,7 @@ jobs: whoami pwd ls -la || true + ls -la ${{github.workspace}} || true mv -rf WinCC_OA_Test/ /opt/ From c83241ed72abd7a5715b8cee289519e2730be968 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:13:19 +0100 Subject: [PATCH 28/64] working dir --- .github/workflows/createBundle.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 7431671..40b71de 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -206,7 +206,7 @@ jobs: runs-on: ubuntu-20.04 container: image: mpokornyetm/winccoa:v3.19.7-uiserver -# options: --user root + options: --user root credentials: username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} @@ -230,7 +230,11 @@ jobs: name: WinCC_OA_Test path: ${{github.workspace}}/WinCC_OA_Test/ + - name: 'Echo download path' + run: echo ${{steps.download.outputs.download-path}} + - name: Register Ctrl TestFramework + working-directory: ${{github.workspace}}/WinCC_OA_Test/ run: | whoami pwd From 01a42ec5b223ba6bace7fb5a6f812307ad6a141a Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:24:15 +0100 Subject: [PATCH 29/64] cwd --- .github/workflows/createBundle.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 40b71de..c6cee9e 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -222,13 +222,13 @@ jobs: uses: actions/download-artifact@v3 with: name: WinCCOA_QualityChecks - path: ${{github.workspace}}/WinCCOA_QualityChecks/ + path: ${{github.workspace}}/ - name: Download WinCC_OA_Test uses: actions/download-artifact@v3 with: name: WinCC_OA_Test - path: ${{github.workspace}}/WinCC_OA_Test/ + path: ${{github.workspace}}/ - name: 'Echo download path' run: echo ${{steps.download.outputs.download-path}} @@ -238,33 +238,32 @@ jobs: run: | whoami pwd + cwd=$(pwd) + echo cwd $cwd ls -la || true - ls -la ${{github.workspace}} || true - mv -rf WinCC_OA_Test/ /opt/ - - ls -la /opt/ || true - ls -la /opt/WinCC_OA_Test/ || true - ls -la /opt/WinCC_OA_Test/Projects/ || true - ls -la /opt/WinCC_OA_Test/Projects/TfCustomizedQG/ || true + mkdir -p $cwd/Projects/TfCustomizedQG/config + cd $cwd/Projects/TfCustomizedQG/config + + echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" - proj_path = \"/opt/WinCC_OA_Test/Projects/Global\" - proj_path = \"/opt/WinCC_OA_Test/Projects/TfCustomizedQG\" + proj_path = \"$cwd//Projects/Global\" + proj_path = \"$cwd//Projects/TfCustomizedQG\" proj_version = \"3.19\" langs = \"de_AT.utf8\" langs = \"en_US.utf8\" langs = \"ru_RU.utf8\" pmonPort = 5999 [testFramework] - installPath = \"/opt/WinCC_OA_Test/\" - " > /opt/WinCC_OA_Test/Projects/TfCustomizedQG/config/config + installPath = \"$cwd//\" + " > config - mkdir -p $/opt/WinCC_OA_Test/Projects/TfCustomizedQG/log + mkdir -p $$cwd//Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCILpmon -config /opt/WinCC_OA_Test/Projects/TfCustomizedQG/config/config -n -autofreg -status + /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd//Projects/TfCustomizedQG/config/config -n -autofreg -status RC=$? if [ "$RC" '!=' "0" ]; then echo "RC=$RC" From 7232251e2fdea958460e18acf9ea425286c8cb90 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:32:28 +0100 Subject: [PATCH 30/64] reg --- .github/workflows/createBundle.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index c6cee9e..ca5210d 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -263,22 +263,17 @@ jobs: mkdir -p $$cwd//Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd//Projects/TfCustomizedQG/config/config -n -autofreg -status - RC=$? - if [ "$RC" '!=' "0" ]; then - echo "RC=$RC" - exit 0 - fi; + /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd//Projects/TfCustomizedQG/config/config -n -autofreg -status || true - name: Start WinCC OA tests run: | echo ****** Execute WinCC OA Tests - /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 + /opt/WinCC_OA/3.19/bin/WCCOActrl -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 - name: Convert WinCC OA tests to jUnit run: | echo ****** Convert results into jUnit format - /opt/WinCC_OA/3.19/bin/WCCOActrl.exe -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 + /opt/WinCC_OA/3.19/bin/WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - name: Publish Test Report uses: mikepenz/action-junit-report@v4 From 8c15b1e71025e49d9f93b356afb3a634ba69217d Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:34:21 +0100 Subject: [PATCH 31/64] 2 slashes --- .github/workflows/createBundle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ca5210d..6399448 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -250,20 +250,20 @@ jobs: echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" - proj_path = \"$cwd//Projects/Global\" - proj_path = \"$cwd//Projects/TfCustomizedQG\" + proj_path = \"$cwd/Projects/Global\" + proj_path = \"$cwd/Projects/TfCustomizedQG\" proj_version = \"3.19\" langs = \"de_AT.utf8\" langs = \"en_US.utf8\" langs = \"ru_RU.utf8\" pmonPort = 5999 [testFramework] - installPath = \"$cwd//\" + installPath = \"$cwd/\" " > config - mkdir -p $$cwd//Projects/TfCustomizedQG/log + mkdir -p $$cwd/Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd//Projects/TfCustomizedQG/config/config -n -autofreg -status || true + /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status || true - name: Start WinCC OA tests run: | From fd340f0b1562548e7daf7073495cb33c8bbf9e13 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:38:32 +0100 Subject: [PATCH 32/64] cat --- .github/workflows/createBundle.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6399448..1f80039 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -261,9 +261,13 @@ jobs: installPath = \"$cwd/\" " > config + cat config + mkdir -p $$cwd/Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status || true + /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status -log +stderr || true + + cat config - name: Start WinCC OA tests run: | From 3955d39f20305a45978a69b58aa2275c1791c8c8 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:44:08 +0100 Subject: [PATCH 33/64] WCCILpmon --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 1f80039..e72df6b 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -265,7 +265,7 @@ jobs: mkdir -p $$cwd/Projects/TfCustomizedQG/log - /opt/WinCC_OA/3.19/bin/WCCOActrl -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status -log +stderr || true + /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status -log +stderr || true cat config From d47dd6cbaed7ecc4914b87ce98cac2a1a8293c2a Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 11:50:09 +0100 Subject: [PATCH 34/64] ls -la --- .github/workflows/createBundle.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index e72df6b..a5780b5 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -261,8 +261,6 @@ jobs: installPath = \"$cwd/\" " > config - cat config - mkdir -p $$cwd/Projects/TfCustomizedQG/log /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status -log +stderr || true @@ -270,14 +268,17 @@ jobs: cat config - name: Start WinCC OA tests + working-directory: /opt/WinCC_OA/3.19/bin/ run: | echo ****** Execute WinCC OA Tests - /opt/WinCC_OA/3.19/bin/WCCOActrl -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 + ls -la /opt/WinCC_OA/3.19/ + ./WCCOActrl -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 - name: Convert WinCC OA tests to jUnit + working-directory: /opt/WinCC_OA/3.19/bin/ run: | echo ****** Convert results into jUnit format - /opt/WinCC_OA/3.19/bin/WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 + ./WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - name: Publish Test Report uses: mikepenz/action-junit-report@v4 From 8c492d3f31298c1215d65301407e757e2ab4cb68 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 12:28:42 +0100 Subject: [PATCH 35/64] help --- .github/workflows/createBundle.yml | 58 ++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index a5780b5..d2d7789 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -168,10 +168,60 @@ jobs: name: ctrlppcheck path: ${{github.workspace}}/build/${{ matrix.config.artifact }} + buildHelp: + name: Build help + runs-on: ubuntu-20.04 + container: + image: mpokornyetm/winccoa:v3.19.7-uiserver + options: --user root + credentials: + username: mpokornyetm + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} + steps: + - uses: actions/checkout@v1 + - name: Register Project + working-directory: ${{github.workspace}}/WinCCOA_QualityChecks/ + run: | + cwd=$(pwd) + + mkdir -p $cwd/config + cd $cwd/config + + echo "[general] + pvss_path = \"/opt/WinCC_OA/3.19\" + proj_path = \"$cwd\" + proj_version = \"3.19\" + langs = \"en_US.utf8\" + pmonPort = 5999 + " > config + + mkdir -p $cwd/log + + /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd/config/config -n -autofreg -status -log +stderr || true + + - name: Generate help + working-directory: /opt/WinCC_OA/3.19/bin/ + run: | + ./WCCOActrl -proj WinCCOA_QualityChecks -n doxygen.ctl -log +stderr -lang en_US.utf8 + ls -la ${{github.workspace}}/WinCCOA_QualityChecks/help/ || true + + - name: Upload Help + uses: actions/upload-artifact@v3 + with: + name: Help + path: ${{github.workspace}}/WinCCOA_QualityChecks/help/* + + # - name: Upload Documentation to Wiki + # uses: SwiftDocOrg/github-wiki-publish-action@v1 + # with: + # path: "Documentation" + # env: + # GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} + package: name: Package project and binaries runs-on: ubuntu-20.04 - needs: build + needs: [build, buildHelp] steps: - uses: actions/checkout@v3 @@ -236,17 +286,11 @@ jobs: - name: Register Ctrl TestFramework working-directory: ${{github.workspace}}/WinCC_OA_Test/ run: | - whoami - pwd cwd=$(pwd) - echo cwd $cwd - ls -la || true mkdir -p $cwd/Projects/TfCustomizedQG/config cd $cwd/Projects/TfCustomizedQG/config - - echo "[general] pvss_path = \"/opt/WinCC_OA/3.19\" proj_path = \"/opt/WinCC_OA/3.19/TestFramework_3.19\" From 94c4c0bf1f6c63d760b0b287eafada34b68a125b Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 12:34:28 +0100 Subject: [PATCH 36/64] Install doxygen --- .github/workflows/createBundle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index d2d7789..ce51bce 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -178,6 +178,12 @@ jobs: username: mpokornyetm password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} steps: + - name: Install doxygen + working-directory: /opt/WinCC_OA/3.19/bin/ + run: | + apt-get update + apt-get --assume-yes install -f doxygen + - uses: actions/checkout@v1 - name: Register Project working-directory: ${{github.workspace}}/WinCCOA_QualityChecks/ From 7d51e3552946b5509fc919fefd6a5e18c48070a3 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 12:43:11 +0100 Subject: [PATCH 37/64] Build help --- .github/workflows/createBundle.yml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ce51bce..e62650d 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: Build help runs-on: ubuntu-20.04 container: - image: mpokornyetm/winccoa:v3.19.7-uiserver + image: mpokornyetm/winccoa:v3.19.7-server options: --user root credentials: username: mpokornyetm @@ -209,13 +209,18 @@ jobs: working-directory: /opt/WinCC_OA/3.19/bin/ run: | ./WCCOActrl -proj WinCCOA_QualityChecks -n doxygen.ctl -log +stderr -lang en_US.utf8 - ls -la ${{github.workspace}}/WinCCOA_QualityChecks/help/ || true - - name: Upload Help + - name: Upload html help uses: actions/upload-artifact@v3 with: - name: Help - path: ${{github.workspace}}/WinCCOA_QualityChecks/help/* + name: wiki-help + path: ${{github.workspace}}/WinCCOA_QualityChecks/help/html/* + + - name: Upload QT help + uses: actions/upload-artifact@v3 + with: + name: qt-help + path: ${{github.workspace}}/WinCCOA_QualityChecks/help/html/index.qch # - name: Upload Documentation to Wiki # uses: SwiftDocOrg/github-wiki-publish-action@v1 @@ -238,6 +243,7 @@ jobs: cp -rp ${{github.workspace}}/WinCCOA_QualityChecks/* ${{github.workspace}}/install/WinCCOA_QualityChecks/ mkdir -p ${{github.workspace}}/tests/WinCC_OA_Test/ cp -rp ${{github.workspace}}/WinCC_OA_Test/* ${{github.workspace}}/tests/WinCC_OA_Test/ + mkdir -p ${{github.workspace}}/install/WinCCOA_QualityChecks/help - name: Download ctrlppcheck binaries uses: actions/download-artifact@v3 @@ -245,6 +251,12 @@ jobs: name: ctrlppcheck path: ${{github.workspace}}/install/WinCCOA_QualityChecks/bin/ctrlppcheck/ + - name: Download help + uses: actions/download-artifact@v3 + with: + name: qt-help + path: ${{github.workspace}}/install/WinCCOA_QualityChecks/help/index.qch + - name: Upload WinCCOA_QualityChecks uses: actions/upload-artifact@v3 with: @@ -261,7 +273,7 @@ jobs: name: WinCC OA tests runs-on: ubuntu-20.04 container: - image: mpokornyetm/winccoa:v3.19.7-uiserver + image: mpokornyetm/winccoa:v3.19.7-full options: --user root credentials: username: mpokornyetm From 7136a243d572033b0138cea141650183224f5242 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 12:54:05 +0100 Subject: [PATCH 38/64] qhelpgenerator --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index e62650d..e63ef07 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: Build help runs-on: ubuntu-20.04 container: - image: mpokornyetm/winccoa:v3.19.7-server + image: mpokornyetm/winccoa:v3.19.7-full options: --user root credentials: username: mpokornyetm From 3a40f3ae21caa259df09898e242c44e377f8402e Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 12:55:23 +0100 Subject: [PATCH 39/64] 3.19.8 --- .github/workflows/createBundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index e63ef07..19e1b78 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -172,7 +172,7 @@ jobs: name: Build help runs-on: ubuntu-20.04 container: - image: mpokornyetm/winccoa:v3.19.7-full + image: mpokornyetm/winccoa:v3.19.8-full options: --user root credentials: username: mpokornyetm @@ -273,7 +273,7 @@ jobs: name: WinCC OA tests runs-on: ubuntu-20.04 container: - image: mpokornyetm/winccoa:v3.19.7-full + image: mpokornyetm/winccoa:v3.19.8-full options: --user root credentials: username: mpokornyetm From 45492812c0eac8c46e7630d884ce31d64be72bc0 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 14:09:32 +0100 Subject: [PATCH 40/64] escape --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 19e1b78..f26ec04 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -334,7 +334,7 @@ jobs: run: | echo ****** Execute WinCC OA Tests ls -la /opt/WinCC_OA/3.19/ - ./WCCOActrl -proj TfCustomizedQG -n testRunner.ctl {'testRunId':'Regression-tests','registerGlobalProject':true,'registerAllTools':true,'registerAllTemplates':true,'showLogViewer':false,'TfTestManager.checkForPossibleFreezeTests':true} -log +stderr -lang en_US.utf8 + ./WCCOActrl -proj TfCustomizedQG -n testRunner.ctl {\'testRunId\':\'Regression-tests\',\'registerGlobalProject\':true,\'registerAllTools\':true,\'registerAllTemplates\':true,\'showLogViewer\':false,\'TfTestManager.checkForPossibleFreezeTests\':true} -log +stderr -lang en_US.utf8 - name: Convert WinCC OA tests to jUnit working-directory: /opt/WinCC_OA/3.19/bin/ From a2f83331a34d4b2a6c3c94b10fecdc93cc3bb726 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 14:19:42 +0100 Subject: [PATCH 41/64] jUnit --- .github/workflows/createBundle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index f26ec04..59b74a8 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -341,11 +341,12 @@ jobs: run: | echo ****** Convert results into jUnit format ./WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 + ls -la ${{github.workspace}}/WinCC_OA_Test/Results/ - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: - report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/*.xml + report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/jUnit*.xml release: if: github.event_name == 'release' From 7c61e2a341ec451fd92c69aa2cfdcc5cdb59a5eb Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 14:23:08 +0100 Subject: [PATCH 42/64] Publish wiki --- .github/workflows/createBundle.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 59b74a8..d1dabe1 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -222,13 +222,6 @@ jobs: name: qt-help path: ${{github.workspace}}/WinCCOA_QualityChecks/help/html/index.qch - # - name: Upload Documentation to Wiki - # uses: SwiftDocOrg/github-wiki-publish-action@v1 - # with: - # path: "Documentation" - # env: - # GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} - package: name: Package project and binaries runs-on: ubuntu-20.04 @@ -377,3 +370,22 @@ jobs: uses: softprops/action-gh-release@v1 with: files: WinCCOA_QualityChecks_${{ github.event.release.tag_name }}.zip + + publish-wiki: + # if: github.event_name == 'release' + name: Publish wiki + runs-on: ubuntu-20.04 + needs: tests + steps: + - name: Download help + uses: actions/download-artifact@v3 + with: + name: wiki-help + path: ${{github.workspace}}/wiki-help/ + + - name: Publish Documentation to Wiki + uses: SwiftDocOrg/github-wiki-publish-action@v1 + with: + path: "wiki-help" + env: + GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} From e7d8ab6c9489986944ad18675e36b3a0e2618e0d Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 14:25:34 +0100 Subject: [PATCH 43/64] jUnit --- .github/workflows/createBundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index d1dabe1..0404a94 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -334,12 +334,12 @@ jobs: run: | echo ****** Convert results into jUnit format ./WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - ls -la ${{github.workspace}}/WinCC_OA_Test/Results/ + ls -la /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/ || true - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: - report_paths : ${{github.workspace}}/WinCC_OA_Test/Results/jUnit*.xml + report_paths : /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/jUnit*.xml release: if: github.event_name == 'release' From adf224ac4ae4653d7a885072f4cc3d2ac5ad750f Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 15:05:25 +0100 Subject: [PATCH 44/64] WIKI_ACTION_TOKEN --- .github/workflows/createBundle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 0404a94..5022855 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -339,6 +339,8 @@ jobs: - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: + fail_on_failure : true + require_tests : true report_paths : /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/jUnit*.xml release: @@ -371,6 +373,7 @@ jobs: with: files: WinCCOA_QualityChecks_${{ github.event.release.tag_name }}.zip +# inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-wiki: # if: github.event_name == 'release' name: Publish wiki @@ -388,4 +391,4 @@ jobs: with: path: "wiki-help" env: - GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }} + GH_PERSONAL_ACCESS_TOKEN: ${{secrets.WIKI_ACTION_TOKEN}} From 022f988d177e670953f6023da6216430fdd7e55f Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 15:22:00 +0100 Subject: [PATCH 45/64] jUnit optional --- .github/workflows/createBundle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 5022855..9e4d910 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -334,12 +334,11 @@ jobs: run: | echo ****** Convert results into jUnit format ./WCCOActrl -proj TfCustomizedQG -n oaTestParsers/jsonToJUnit.ctl -log +stderr -lang en_US.utf8 - ls -la /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/ || true - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: - fail_on_failure : true + # fail_on_failure : true require_tests : true report_paths : /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/jUnit*.xml From 5cb3e07fdd29a6cd7d19b3f8e300f8ad07682163 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 15:39:14 +0100 Subject: [PATCH 46/64] wiki --- .github/workflows/createBundle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 9e4d910..6124fe5 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -383,11 +383,11 @@ jobs: uses: actions/download-artifact@v3 with: name: wiki-help - path: ${{github.workspace}}/wiki-help/ + path: ${{github.workspace}}/ - name: Publish Documentation to Wiki uses: SwiftDocOrg/github-wiki-publish-action@v1 - with: - path: "wiki-help" + # with: + # path: "wiki-help" env: GH_PERSONAL_ACCESS_TOKEN: ${{secrets.WIKI_ACTION_TOKEN}} From 58a716220097662864b7599f67f94ce3068256fc Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 15:56:35 +0100 Subject: [PATCH 47/64] actions-gh-pages --- .github/workflows/createBundle.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6124fe5..6b64363 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -385,9 +385,19 @@ jobs: name: wiki-help path: ${{github.workspace}}/ - - name: Publish Documentation to Wiki - uses: SwiftDocOrg/github-wiki-publish-action@v1 - # with: - # path: "wiki-help" - env: - GH_PERSONAL_ACCESS_TOKEN: ${{secrets.WIKI_ACTION_TOKEN}} + - name: Publish Documentation + uses: peaceiris/actions-gh-pages@v3 + # If you're changing the branch from main, + # also change the `main` in `refs/heads/main` + # below accordingly. + # if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.WIKI_ACTION_TOKEN }} + publish_dir: ./public + +# - name: Publish Documentation to Wiki +# uses: SwiftDocOrg/github-wiki-publish-action@v1 +# # with: +# # path: "wiki-help" +# env: +# GH_PERSONAL_ACCESS_TOKEN: ${{secrets.WIKI_ACTION_TOKEN}} From 2e3aae4c4d3bcaa8894c7dc028f2f3e184dd1e9b Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 16:04:03 +0100 Subject: [PATCH 48/64] publish_dir --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 6b64363..ba6be26 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -393,7 +393,7 @@ jobs: # if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.WIKI_ACTION_TOKEN }} - publish_dir: ./public +# publish_dir: ./public # - name: Publish Documentation to Wiki # uses: SwiftDocOrg/github-wiki-publish-action@v1 From 93cae68efd0b579817707b440761ff8cbf7bec41 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 16:27:39 +0100 Subject: [PATCH 49/64] publish_dir public --- .github/workflows/createBundle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ba6be26..14c320c 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -383,7 +383,7 @@ jobs: uses: actions/download-artifact@v3 with: name: wiki-help - path: ${{github.workspace}}/ + path: ${{github.workspace}}/public/ - name: Publish Documentation uses: peaceiris/actions-gh-pages@v3 @@ -393,7 +393,7 @@ jobs: # if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.WIKI_ACTION_TOKEN }} -# publish_dir: ./public + publish_dir: ./public # - name: Publish Documentation to Wiki # uses: SwiftDocOrg/github-wiki-publish-action@v1 From 425ae1dbbf558a93dabbbaaab21687ccac4a94af Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 16:37:21 +0100 Subject: [PATCH 50/64] an echo --- .github/workflows/createBundle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 14c320c..39be0d6 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -384,6 +384,12 @@ jobs: with: name: wiki-help path: ${{github.workspace}}/public/ + + - name: echo + run: | + ls -la ${{github.workspace}}/ || true + ls -la ${{github.workspace}}/public/ || true + - name: Publish Documentation uses: peaceiris/actions-gh-pages@v3 From 103c3f7cc5b4f71e6e2b737a78a452eaa1a505a9 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 18:11:18 +0100 Subject: [PATCH 51/64] clean up workflow --- .github/workflows/createBundle.yml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 39be0d6..e42ad03 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -155,12 +155,6 @@ jobs: execute_process(COMMAND sccache --show-stats) endif() - # no ctest tests for modified cppcheck, they were just thrown away - #- name: Test - # working-directory: ${{github.workspace}}/build - # # Execute tests defined by the CMake configuration. - # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - # run: ctest -C ${{env.BUILD_TYPE}} - name: Upload ctrlppcheck uses: actions/upload-artifact@v3 @@ -310,7 +304,6 @@ jobs: proj_version = \"3.19\" langs = \"de_AT.utf8\" langs = \"en_US.utf8\" - langs = \"ru_RU.utf8\" pmonPort = 5999 [testFramework] installPath = \"$cwd/\" @@ -319,8 +312,6 @@ jobs: mkdir -p $$cwd/Projects/TfCustomizedQG/log /opt/WinCC_OA/3.19/bin/WCCILpmon -config $cwd/Projects/TfCustomizedQG/config/config -n -autofreg -status -log +stderr || true - - cat config - name: Start WinCC OA tests working-directory: /opt/WinCC_OA/3.19/bin/ @@ -374,7 +365,7 @@ jobs: # inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-wiki: - # if: github.event_name == 'release' + if: github.event_name == 'release' name: Publish wiki runs-on: ubuntu-20.04 needs: tests @@ -384,12 +375,6 @@ jobs: with: name: wiki-help path: ${{github.workspace}}/public/ - - - name: echo - run: | - ls -la ${{github.workspace}}/ || true - ls -la ${{github.workspace}}/public/ || true - - name: Publish Documentation uses: peaceiris/actions-gh-pages@v3 @@ -400,10 +385,3 @@ jobs: with: github_token: ${{ secrets.WIKI_ACTION_TOKEN }} publish_dir: ./public - -# - name: Publish Documentation to Wiki -# uses: SwiftDocOrg/github-wiki-publish-action@v1 -# # with: -# # path: "wiki-help" -# env: -# GH_PERSONAL_ACCESS_TOKEN: ${{secrets.WIKI_ACTION_TOKEN}} From 39f53c40fb0c0e2d6981879c28740a57519c744d Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 18:29:31 +0100 Subject: [PATCH 52/64] The testcase Ctrlppcheck has no assertions in good case --- .../sub_app/scripts/QgCtrlppcheckTests.ctl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl b/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl index 4d5e2fb..4958631 100644 --- a/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl +++ b/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl @@ -23,7 +23,7 @@ class MockCppCheck : CppCheck { string s; fileToString(testFile, s); - s = substr(s, 0, strpos(s, "\n")); // get fist lines + s = substr(s, 0, strpos(s, "\n")); // get first line const string key = "// start options: "; int idx = strpos(s, key); @@ -32,14 +32,14 @@ class MockCppCheck : CppCheck else s = ""; - DebugN(__FUNCTION__, testFile, s); + info("Start check of test file: " + testFile + ", with options:" + s); start(testFile + s); stdErrToErrList(); } public void compare(const string &refFile) { - DebugTN(__FUNCTION__, refFile); + info("Compare result with reference file: " + refFile); const string tcId = "Ctrlppcheck." + baseName(refFile); string str; bool hasFailedRead = fileToString(refFile, str, "UTF8"); @@ -89,8 +89,6 @@ class MockCppCheck : CppCheck // DebugN(__FUNCTION__, map, expErr); oaUnitAssertGreater(tcId, dynContains(simpleErrStrings, expErrorStr), 0, map); } - - } }; @@ -163,6 +161,10 @@ class TstCtrlppcheck : OaTest mkdir(resDir); moveFile(PROJ_PATH + LOG_REL_PATH + "cppcheck-result.xml", resDir + baseName(refFile)); + + // please keep this dummy pass() here to eliminate following failure + // Can not determine test case data ('Ctrlppcheck'). Check results for 'suite_CtrlppCheck/CtrlppCheck_App_3.19' + pass("The file " + path + " has been analyzed"); return 0; } } From 514f0eac71a9e5e7b8a21acbb098b5cb319a14fe Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 18:41:49 +0100 Subject: [PATCH 53/64] fix tests --- .../sub_app/scripts/QgCtrlppcheckTests.ctl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl b/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl index 4958631..c2cc571 100644 --- a/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl +++ b/WinCC_OA_Test/TestSuites/suite_CtrlppCheck/sub_app/scripts/QgCtrlppcheckTests.ctl @@ -19,6 +19,8 @@ class MockCppCheck : CppCheck { + string tcId; + public void checkFile(const string &testFile) { string s; @@ -32,15 +34,15 @@ class MockCppCheck : CppCheck else s = ""; - info("Start check of test file: " + testFile + ", with options:" + s); + oaUnitInfo(tcId, "Start check of test file: " + testFile + ", with options:" + s); start(testFile + s); stdErrToErrList(); } public void compare(const string &refFile) { - info("Compare result with reference file: " + refFile); - const string tcId = "Ctrlppcheck." + baseName(refFile); + tcId = "Ctrlppcheck." + baseName(refFile); + oaUnitInfo(tcId, "Compare result with reference file: " + refFile); string str; bool hasFailedRead = fileToString(refFile, str, "UTF8"); str = str.trim(); From 45af7a8aeafa3def50eb6e82e01b1c7d3b6635ec Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 18:43:40 +0100 Subject: [PATCH 54/64] better wording --- .github/workflows/createBundle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index e42ad03..ea05aa2 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -207,7 +207,7 @@ jobs: - name: Upload html help uses: actions/upload-artifact@v3 with: - name: wiki-help + name: html-help path: ${{github.workspace}}/WinCCOA_QualityChecks/help/html/* - name: Upload QT help @@ -364,19 +364,19 @@ jobs: files: WinCCOA_QualityChecks_${{ github.event.release.tag_name }}.zip # inspired by https://nimblehq.co/blog/create-github-wiki-pull-request - publish-wiki: + publish-help: if: github.event_name == 'release' - name: Publish wiki + name: Publish help runs-on: ubuntu-20.04 needs: tests steps: - name: Download help uses: actions/download-artifact@v3 with: - name: wiki-help + name: html-help path: ${{github.workspace}}/public/ - - name: Publish Documentation + - name: Publish GitHub pages help uses: peaceiris/actions-gh-pages@v3 # If you're changing the branch from main, # also change the `main` in `refs/heads/main` From a69c19510ed09483236dee89e020ab45d1d8b6a9 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Wed, 13 Dec 2023 18:44:11 +0100 Subject: [PATCH 55/64] jUnit: fail_on_failure --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ea05aa2..ed5bd54 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -329,7 +329,7 @@ jobs: - name: Publish Test Report uses: mikepenz/action-junit-report@v4 with: - # fail_on_failure : true + fail_on_failure : true require_tests : true report_paths : /__w/CtrlppCheck/CtrlppCheck/WinCC_OA_Test/Results/jUnit*.xml From a3d8f18ad29b4a6e97e01055eddfd873a92eeced Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 20:14:05 +0100 Subject: [PATCH 56/64] simulate publish GH pages --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index ed5bd54..3b61bec 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -365,7 +365,7 @@ jobs: # inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-help: - if: github.event_name == 'release' + # if: github.event_name == 'release' name: Publish help runs-on: ubuntu-20.04 needs: tests From 6a0b4fd4ce2ca466e58036a202793336b6638702 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 20:18:51 +0100 Subject: [PATCH 57/64] sim --- .github/workflows/createBundle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 3b61bec..9052c95 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [ "main", "release/*" , "tests-*"] + branches: [ "main", "release/*" , "tests-*", "simulate-*"] # tags: ["v*"] pull_request: branches: [ "main", "release/*" ] From 3b5d51e7850ba9435eaed4ccbdc9bdac5f506ade Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 21:11:38 +0100 Subject: [PATCH 58/64] deploy-pages --- .github/workflows/createBundle.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 9052c95..9e93c3e 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -376,12 +376,13 @@ jobs: name: html-help path: ${{github.workspace}}/public/ - - name: Publish GitHub pages help - uses: peaceiris/actions-gh-pages@v3 - # If you're changing the branch from main, - # also change the `main` in `refs/heads/main` - # below accordingly. - # if: github.ref == 'refs/heads/main' + - name: Setup Pages + uses: actions/configure-pages@v4 + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 with: - github_token: ${{ secrets.WIKI_ACTION_TOKEN }} - publish_dir: ./public + # Upload entire repository + path: '.' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v3 From 77ac2e4513c7219a753bafbfea2903b267f2ec18 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 21:39:07 +0100 Subject: [PATCH 59/64] gh-pages fix --- .github/workflows/createBundle.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 9e93c3e..5e6dfa3 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -9,6 +9,12 @@ on: release: types: [published] +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release @@ -366,6 +372,9 @@ jobs: # inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-help: # if: github.event_name == 'release' + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} name: Publish help runs-on: ubuntu-20.04 needs: tests From 9c961e55352587c1f76938fc2b9ad4112bc8b751 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 21:46:18 +0100 Subject: [PATCH 60/64] ubuntu-latest --- .github/workflows/createBundle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 5e6dfa3..bea15ca 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -176,7 +176,7 @@ jobs: options: --user root credentials: username: mpokornyetm - password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} steps: - name: Install doxygen working-directory: /opt/WinCC_OA/3.19/bin/ @@ -270,7 +270,7 @@ jobs: options: --user root credentials: username: mpokornyetm - password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} + password: ${{ secrets.DOCKER_CONTAINER_REGISTRY_TOKEN }} needs: [build, package] steps: @@ -376,14 +376,14 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} name: Publish help - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: tests steps: - name: Download help uses: actions/download-artifact@v3 with: name: html-help - path: ${{github.workspace}}/public/ + path: ${{github.workspace}}/ - name: Setup Pages uses: actions/configure-pages@v4 From 155346857ef4fada06d154cf3d41bd3bcfbbdc13 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 21:50:51 +0100 Subject: [PATCH 61/64] download-artifac --- .github/workflows/createBundle.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index bea15ca..80de1c6 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -369,7 +369,6 @@ jobs: with: files: WinCCOA_QualityChecks_${{ github.event.release.tag_name }}.zip -# inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-help: # if: github.event_name == 'release' environment: @@ -385,13 +384,13 @@ jobs: name: html-help path: ${{github.workspace}}/ - - name: Setup Pages - uses: actions/configure-pages@v4 - - name: Upload artifact - uses: actions/upload-pages-artifact@v2 - with: - # Upload entire repository - path: '.' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v3 + # - name: Setup Pages + # uses: actions/configure-pages@v4 + # - name: Upload artifact + # uses: actions/upload-pages-artifact@v2 + # with: + # # Upload entire repository + # path: '.' + # - name: Deploy to GitHub Pages + # id: deployment + # uses: actions/deploy-pages@v3 From 9cdfe65beca91377bcff03401dcc7b01def2fdc7 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 22:37:26 +0100 Subject: [PATCH 62/64] static pages --- .github/workflows/createBundle.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 80de1c6..02ba1e2 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -369,11 +369,10 @@ jobs: with: files: WinCCOA_QualityChecks_${{ github.event.release.tag_name }}.zip + +# inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-help: - # if: github.event_name == 'release' - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} + # if: github.event_name == 'release' name: Publish help runs-on: ubuntu-latest needs: tests @@ -382,15 +381,14 @@ jobs: uses: actions/download-artifact@v3 with: name: html-help - path: ${{github.workspace}}/ - - # - name: Setup Pages - # uses: actions/configure-pages@v4 - # - name: Upload artifact - # uses: actions/upload-pages-artifact@v2 - # with: - # # Upload entire repository - # path: '.' - # - name: Deploy to GitHub Pages - # id: deployment - # uses: actions/deploy-pages@v3 + path: ${{github.workspace}}/docs/ + + - name: Publish GitHub pages help + uses: peaceiris/actions-gh-pages@v3 + # If you're changing the branch from main, + # also change the `main` in `refs/heads/main` + # below accordingly. + # if: github.ref == 'refs/heads/main' + with: + github_token: ${{ secrets.WIKI_ACTION_TOKEN }} + publish_dir: ./docs From 9d5de28fecdc18c82ecf764d70bf6613e06abc5a Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 22:44:37 +0100 Subject: [PATCH 63/64] todo --- .github/workflows/createBundle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index 02ba1e2..f1a8d4d 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -372,6 +372,7 @@ jobs: # inspired by https://nimblehq.co/blog/create-github-wiki-pull-request publish-help: +# !! TODO enable it only on release # if: github.event_name == 'release' name: Publish help runs-on: ubuntu-latest From 9f101eaf0b2e6dff24550955e6ed8b61f9cc5964 Mon Sep 17 00:00:00 2001 From: Pokorny Martin Date: Sun, 17 Dec 2023 22:47:50 +0100 Subject: [PATCH 64/64] workflow rules --- .github/workflows/createBundle.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/createBundle.yml b/.github/workflows/createBundle.yml index f1a8d4d..4f564a0 100644 --- a/.github/workflows/createBundle.yml +++ b/.github/workflows/createBundle.yml @@ -2,7 +2,7 @@ name: CI on: push: - branches: [ "main", "release/*" , "tests-*", "simulate-*"] + branches: [ "main", "release/*" , "feature/*"] # tags: ["v*"] pull_request: branches: [ "main", "release/*" ] @@ -386,10 +386,6 @@ jobs: - name: Publish GitHub pages help uses: peaceiris/actions-gh-pages@v3 - # If you're changing the branch from main, - # also change the `main` in `refs/heads/main` - # below accordingly. - # if: github.ref == 'refs/heads/main' with: github_token: ${{ secrets.WIKI_ACTION_TOKEN }} publish_dir: ./docs