Skip to content

Commit

Permalink
Merge pull request #183 from reportportal/develop
Browse files Browse the repository at this point in the history
Release 5.1.5
  • Loading branch information
AmsterGet authored Jan 19, 2024
2 parents 10e6212 + 90db0c8 commit 8333496
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @AmsterGet @Bam6ycha
* @AmsterGet
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
releaseVersion: ${{ steps.exposeVersion.outputs.releaseVersion }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Read version
id: readVersion
run: |
Expand Down Expand Up @@ -70,16 +70,17 @@ jobs:
else
echo "::set-output name=releaseVersion::${{ steps.readVersion.outputs.version }}"
fi
create-tag:
needs: calculate-version
runs-on: ubuntu-latest
outputs:
versionInfo: ${{ steps.readChangelogEntry.outputs.log_entry }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup NodeJS
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '12'
- name: Configure git
Expand Down Expand Up @@ -126,16 +127,18 @@ jobs:
git checkout develop
git merge master -Xtheirs --allow-unrelated-histories
echo "${{ steps.bumpSnapshotVersion.outputs.next-version }}-SNAPSHOT" > ${{ env.versionFileName }}
echo "patch" > ${{ env.versionFragmentFileName }}
git status
git add ${{ env.versionFileName }}
git commit -m "${{ needs.calculate-version.outputs.releaseVersion }} -> ${{ steps.bumpSnapshotVersion.outputs.next-version }}-SNAPSHOT"
git push origin develop
create-release:
needs: [calculate-version, create-tag]
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Create Release
id: createRelease
uses: actions/create-release@v1
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
### Deprecated
- Node.js 10 usage. This version is the latest that supports Node.js 10.

## [5.1.4] - 2023-10-23
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1.4
5.1.5-SNAPSHOT
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"url": "https://github.com/reportportal/agent-js-cypress"
},
"dependencies": {
"@reportportal/client-javascript": "^5.0.14",
"@reportportal/client-javascript": "~5.0.15",
"glob": "^7.2.3",
"minimatch": "^3.1.2",
"mocha": "^10.2.0",
Expand Down

0 comments on commit 8333496

Please sign in to comment.