From be39728fcc9d95bf477c9dc977f3c4d630ec598e Mon Sep 17 00:00:00 2001 From: Ilya Hancharyk Date: Fri, 19 Jan 2024 20:13:40 +0300 Subject: [PATCH 1/4] EPMRPP-87604 || Use only patch versions of JS client automatically --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fb7187..9a541a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,10 +6,10 @@ "packages": { "": { "name": "@reportportal/agent-js-cypress", - "version": "5.1.3", + "version": "5.1.4", "license": "Apache-2.0", "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", @@ -1301,9 +1301,9 @@ } }, "node_modules/@reportportal/client-javascript": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/@reportportal/client-javascript/-/client-javascript-5.0.14.tgz", - "integrity": "sha512-4ge9ddOB1rFlzqI6j43qCw0cyjQOloiPChA1EFyF3dcV2BXHzGbh8S3SNhwxibvlQtV6piU8e0W9CLN4UWXvSA==", + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/@reportportal/client-javascript/-/client-javascript-5.0.15.tgz", + "integrity": "sha512-ry6euqCOoJLXCUuBhlRMjCYKhbgU+9EYdZ8jpTuagoBVxS8V8nJed9ODnS4bXX61g+pJm+NP/0DrN2Ptq+DgQQ==", "dependencies": { "axios": "^0.27.2", "axios-retry": "^3.4.0", diff --git a/package.json b/package.json index e3f7246..65786e3 100644 --- a/package.json +++ b/package.json @@ -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", From c5060301f185f561c7fdc319960a319345317ea4 Mon Sep 17 00:00:00 2001 From: Ilya Hancharyk Date: Fri, 19 Jan 2024 20:15:51 +0300 Subject: [PATCH 2/4] EPMRPP-87604 || Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50973ac..7c7e724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 4c7408e74ef4fe1faba09070863f8080f7dad648 Mon Sep 17 00:00:00 2001 From: Ilya Hancharyk Date: Fri, 19 Jan 2024 20:17:52 +0300 Subject: [PATCH 3/4] EPMRPP-87604 || Set version fragment to patch after release --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6d329b..d835ba2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -70,6 +70,7 @@ jobs: else echo "::set-output name=releaseVersion::${{ steps.readVersion.outputs.version }}" fi + create-tag: needs: calculate-version runs-on: ubuntu-latest @@ -126,10 +127,12 @@ 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 From e0cb995b14ba540afc6bc9c30546b154c9c00c1d Mon Sep 17 00:00:00 2001 From: Ilya Hancharyk Date: Fri, 19 Jan 2024 20:18:55 +0300 Subject: [PATCH 4/4] EPMRPP-87604 || Bump versions of GitHub actions for release workflow --- .github/workflows/release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d835ba2..ac4e27d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: | @@ -78,9 +78,9 @@ jobs: 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 @@ -138,7 +138,7 @@ jobs: 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