Skip to content

Commit 83f44cc

Browse files
authored
Merge pull request #250 from reportportal/develop
Release
2 parents 366474e + 03c43c5 commit 83f44cc

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.github/workflows/release.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ jobs:
6868
name: 'reportportal.io'
6969
7070
token: ${{ secrets.GITHUB_TOKEN }}
71-
72-
- name: Tagging new version
73-
id: newVersionTag
74-
run: |
75-
git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}"
76-
git push --tags
71+
#
72+
# - name: Tagging new version
73+
# id: newVersionTag
74+
# run: |
75+
# git tag -a ${{ env.RELEASE_VERSION }} -m "Release ${{ env.RELEASE_VERSION }}"
76+
# git push --tags
7777

7878
- name: Checkout develop branch
7979
uses: actions/checkout@v4
@@ -108,20 +108,20 @@ jobs:
108108
version: ${{ env.RELEASE_VERSION }}
109109
path: ./${{ env.CHANGE_LOG_FILE }}
110110

111-
- name: Create Release
112-
id: createRelease
113-
uses: ncipollo/release-action@v1
114-
with:
115-
tag: ${{ env.RELEASE_VERSION }}
116-
name: Release ${{ env.RELEASE_VERSION }}
117-
body: ${{ steps.readChangelogEntry.outputs.changes }}
111+
# - name: Create Release
112+
# id: createRelease
113+
# uses: ncipollo/release-action@v1
114+
# with:
115+
# tag: ${{ env.RELEASE_VERSION }}
116+
# name: Release ${{ env.RELEASE_VERSION }}
117+
# body: ${{ steps.readChangelogEntry.outputs.changes }}
118118

119119
- name: Update version file
120120
id: versionFileUpdate
121121
run: |
122-
export CURRENT_VERSION_VALUE=`echo '${{ env.CURRENT_VERSION }}' | sed -E "s/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/"`
123-
export NEXT_VERSION_VALUE=`echo '${{ env.NEXT_VERSION }}' | sed -E "s/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/"`
124-
sed "s/${CURRENT_VERSION_VALUE}/${NEXT_VERSION_VALUE}/g" ${{ env.VERSION_FILE }} > ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }}
122+
export CURRENT_VERSION_VALUE=`echo '${{ env.CURRENT_VERSION }}' | sed -E 's/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/'`
123+
export NEXT_VERSION_VALUE=`echo '${{ env.NEXT_VERSION }}' | sed -E 's/(.*)/${{ env.VERSION_REPLACE_PATTERN }}/'`
124+
sed 's/${CURRENT_VERSION_VALUE}/${NEXT_VERSION_VALUE}/g' ${{ env.VERSION_FILE }} > ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }}
125125
rm ${{ env.VERSION_FILE }}
126126
mv ${{ env.VERSION_FILE }}${{ env.TMP_SUFFIX }} ${{ env.VERSION_FILE }}
127127
git add ${{ env.VERSION_FILE }}

tests/core/test_rp_responses.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import json
1515
from unittest import mock
1616

17+
# noinspection PyPackageRequirements
1718
import pytest
1819

1920
from reportportal_client.core.rp_responses import AsyncRPResponse, RPResponse

0 commit comments

Comments
 (0)