Merge pull request #250 from reportportal/develop

Release
reportportal · Dec 19, 2024 · 83f44cc · 83f44cc
2 parents 366474e + 03c43c5
commit 83f44cc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -68,12 +68,12 @@ jobs:
           name: 'reportportal.io'
           email: '[email protected]'
           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
@@ -108,20 +108,20 @@ 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
         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 }}

diff --git 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