From 46777bd4aacab433ec7843b32251465ddd37829d Mon Sep 17 00:00:00 2001 From: German Date: Thu, 27 Jun 2024 15:16:21 +0200 Subject: [PATCH 1/4] chore: renaming the coverage artifacts to match Ubuntu based --- .github/workflows/ci.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 555da1bac8..091bc3916f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -410,6 +410,13 @@ jobs: echo "Distributed mode: $distributed_mode" echo "distributed_mode=$(echo $distributed_mode)" >> $GITHUB_OUTPUT + - name: "Get if running on Ubuntu" + id: ubuntu_check + run: | + if [[ "${{ matrix.mapdl-version }}" == *"ubuntu"* ]]; then export ON_UBUNTU=true; else export ON_UBUNTU=false; fi + echo "ON_UBUNTU: $ON_UBUNTU" + echo "ON_UBUNTU=$(echo $ON_UBUNTU)" >> $GITHUB_OUTPUT + - name: "Pull, launch, and validate MAPDL service" id: start_mapdl env: @@ -483,26 +490,26 @@ jobs: - name: "Unit testing" env: DISTRIBUTED_MODE: ${{ steps.distributed_mode.outputs.distributed_mode }} + ON_UBUNTU: ${{ steps.ubuntu_check.outputs.ON_UBUNTU }} run: | - if [[ "${{ matrix.mapdl-version }}" == *"ubuntu"* ]]; then export ON_UBUNTU=true; else export ON_UBUNTU=false; fi echo "ON_UBUNTU: $ON_UBUNTU" xvfb-run pytest \ ${{ env.PYTEST_ARGUMENTS }} \ --ignore_image_cache \ - --cov-report=xml:centos-${{ matrix.mapdl-version }}-remote.xml + --cov-report=xml:${{ matrix.mapdl-version }}-remote.xml - uses: codecov/codecov-action@v4 name: "Upload coverage to Codecov" with: token: ${{ secrets.CODECOV_TOKEN }} # required - name: centos-${{ matrix.mapdl-version }}-remote.xml - flags: centos,remote,${{ matrix.mapdl-version }} + name: ${{ matrix.mapdl-version }}-remote.xml + flags: remote,${{ steps.ubuntu_check.outputs.ON_UBUNTU }},${{ matrix.mapdl-version }},${{ steps.distributed_mode.outputs.distributed_mode }} - name: Upload coverage artifacts uses: actions/upload-artifact@v4 with: - name: centos-${{ matrix.mapdl-version }}-remote.xml - path: ./centos-${{ matrix.mapdl-version }}-remote.xml + name: ${{ matrix.mapdl-version }}-remote.xml + path: ./${{ matrix.mapdl-version }}-remote.xml - name: "Check package" run: | From 30e5e18db823f5e466300ca449bab45abff1d37d Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot Date: Thu, 27 Jun 2024 13:20:08 +0000 Subject: [PATCH 2/4] Adding changelog entry: 3225.fixed.md --- doc/changelog.d/3225.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/changelog.d/3225.fixed.md diff --git a/doc/changelog.d/3225.fixed.md b/doc/changelog.d/3225.fixed.md new file mode 100644 index 0000000000..8f80ce49a7 --- /dev/null +++ b/doc/changelog.d/3225.fixed.md @@ -0,0 +1 @@ +Fix: wrong tagging on the coverage artifacts \ No newline at end of file From 09069644ec2884bf88abb20974b8b66051371325 Mon Sep 17 00:00:00 2001 From: pyansys-ci-bot Date: Thu, 27 Jun 2024 13:37:26 +0000 Subject: [PATCH 3/4] Adding changelog entry: 3225.fixed.md --- doc/changelog.d/3225.fixed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/changelog.d/3225.fixed.md b/doc/changelog.d/3225.fixed.md index 8f80ce49a7..8184740967 100644 --- a/doc/changelog.d/3225.fixed.md +++ b/doc/changelog.d/3225.fixed.md @@ -1 +1 @@ -Fix: wrong tagging on the coverage artifacts \ No newline at end of file +ci: wrong tagging on the coverage artifacts \ No newline at end of file From 44ef8e6def7c8454e0516f056049976070167b61 Mon Sep 17 00:00:00 2001 From: German Date: Thu, 27 Jun 2024 15:48:43 +0200 Subject: [PATCH 4/4] fix: using a proper tag for coverage (instead of bool) --- .github/workflows/ci.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 091bc3916f..3ff5136b92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -413,10 +413,27 @@ jobs: - name: "Get if running on Ubuntu" id: ubuntu_check run: | - if [[ "${{ matrix.mapdl-version }}" == *"ubuntu"* ]]; then export ON_UBUNTU=true; else export ON_UBUNTU=false; fi + if [[ "${{ matrix.mapdl-version }}" == *"ubuntu"* ]]; + then export ON_UBUNTU=true; export TAG_UBUNTU="ubuntu"; + else export ON_UBUNTU=false; export TAG_UBUNTU="centos"; + fi echo "ON_UBUNTU: $ON_UBUNTU" + echo "TAG_UBUNTU: $TAG_UBUNTU" echo "ON_UBUNTU=$(echo $ON_UBUNTU)" >> $GITHUB_OUTPUT + echo "TAG_UBUNTU=$(echo $TAG_UBUNTU)" >> $GITHUB_OUTPUT + - name: "Get if running student version" + id: student_check + run: | + if [[ "${{ matrix.mapdl-version }}" == *"student"* ]]; + then export ON_STUDENT=true; export TAG_STUDENT="student"; + else export ON_STUDENT=false; export TAG_STUDENT="non-student"; + fi + echo "ON_STUDENT: $ON_STUDENT" + echo "TAG_STUDENT: $TAG_STUDENT" + echo "ON_STUDENT=$(echo $ON_STUDENT)" >> $GITHUB_OUTPUT + echo "TAG_STUDENT=$(echo $TAG_STUDENT)" >> $GITHUB_OUTPUT + - name: "Pull, launch, and validate MAPDL service" id: start_mapdl env: @@ -491,8 +508,10 @@ jobs: env: DISTRIBUTED_MODE: ${{ steps.distributed_mode.outputs.distributed_mode }} ON_UBUNTU: ${{ steps.ubuntu_check.outputs.ON_UBUNTU }} + ON_STUDENT: ${{ steps.ubuntu_check.outputs.ON_STUDENT }} run: | echo "ON_UBUNTU: $ON_UBUNTU" + echo "ON_STUDENT: $ON_STUDENT" xvfb-run pytest \ ${{ env.PYTEST_ARGUMENTS }} \ --ignore_image_cache \ @@ -503,7 +522,7 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} # required name: ${{ matrix.mapdl-version }}-remote.xml - flags: remote,${{ steps.ubuntu_check.outputs.ON_UBUNTU }},${{ matrix.mapdl-version }},${{ steps.distributed_mode.outputs.distributed_mode }} + flags: remote,${{ steps.ubuntu_check.outputs.TAG_UBUNTU }},${{ matrix.mapdl-version }},${{ steps.distributed_mode.outputs.distributed_mode }},${{ steps.ubuntu_check.outputs.TAG_STUDENT }} - name: Upload coverage artifacts uses: actions/upload-artifact@v4