From b5372ff43a6556ba02720b9f92b6c20f1bb1eeaf Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 19 Dec 2024 19:34:29 +0300 Subject: [PATCH 1/3] Release update --- .github/workflows/release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2574f9d..d06c293 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,12 +68,12 @@ jobs: name: 'reportportal.io' email: 'support@reportportal.io' token: ${{ secrets.GITHUB_TOKEN }} - - - name: Tagging new version - id: newVersionTag - run: | - git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}" - git push --tags +# +# - name: Tagging new version +# id: newVersionTag +# run: | +# git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}" +# git push --tags - name: Checkout develop branch uses: actions/checkout@v4 @@ -119,9 +119,9 @@ jobs: - name: Update version file id: versionFileUpdate run: | - export CURRENT_VERSION_VALUE=`echo '${{ env.CURRENT_VERSION }}' | sed -E "s/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/"` - export NEXT_VERSION_VALUE=`echo '${{ env.NEXT_VERSION }}' | sed -E "s/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/"` - sed "s/${CURRENT_VERSION_VALUE}/${NEXT_VERSION_VALUE}/g" ${{ env.VERSION_FILE }} > ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }} + export CURRENT_VERSION_VALUE=`echo '${{ env.CURRENT_VERSION }}' | sed -E 's/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/'` + export NEXT_VERSION_VALUE=`echo '${{ env.NEXT_VERSION }}' | sed -E 's/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/'` + sed 's/${CURRENT_VERSION_VALUE}/${NEXT_VERSION_VALUE}/g' ${{ env.VERSION_FILE }} > ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }} rm ${{ env.VERSION_FILE }} mv ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }} ${{ env.VERSION_FILE }} git add ${{ env.VERSION_FILE }} From ba5e109beabeae068ffcf384c7fdc950677e14a2 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 19 Dec 2024 19:35:04 +0300 Subject: [PATCH 2/3] Fix warning --- tests/core/test_rp_responses.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/core/test_rp_responses.py b/tests/core/test_rp_responses.py index 3812175..c784108 100644 --- a/tests/core/test_rp_responses.py +++ b/tests/core/test_rp_responses.py @@ -14,6 +14,7 @@ import json from unittest import mock +# noinspection PyPackageRequirements import pytest from reportportal_client.core.rp_responses import AsyncRPResponse, RPResponse From 03c43c53dc401839e62e509771d71d69ed4e8f4e Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 19 Dec 2024 19:36:50 +0300 Subject: [PATCH 3/3] Update release.yml --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d06c293..2a66342 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -108,13 +108,13 @@ jobs: version: ${{ env.RELEASE_VERSION }} path: ./${{ env.CHANGE_LOG_FILE }} - - name: Create Release - id: createRelease - uses: ncipollo/release-action@v1 - with: - tag: ${{ env.RELEASE_VERSION }} - name: Release ${{ env.RELEASE_VERSION }} - body: ${{ steps.readChangelogEntry.outputs.changes }} +# - name: Create Release +# id: createRelease +# uses: ncipollo/release-action@v1 +# with: +# tag: ${{ env.RELEASE_VERSION }} +# name: Release ${{ env.RELEASE_VERSION }} +# body: ${{ steps.readChangelogEntry.outputs.changes }} - name: Update version file id: versionFileUpdate