From fe6733582f03e610b6166a0e197c1b03ba9f3eed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Mar 2022 00:01:18 +0000 Subject: [PATCH 1/3] build(deps): bump @cycjimmy/awesome-js-funcs from 3.1.0 to 4.0.4 Bumps [@cycjimmy/awesome-js-funcs](https://github.com/cycjimmy/awesome-js-funcs) from 3.1.0 to 4.0.4. - [Release notes](https://github.com/cycjimmy/awesome-js-funcs/releases) - [Changelog](https://github.com/cycjimmy/awesome-js-funcs/blob/main/release.config.cjs) - [Commits](https://github.com/cycjimmy/awesome-js-funcs/compare/v3.1.0...v4.0.4) --- updated-dependencies: - dependency-name: "@cycjimmy/awesome-js-funcs" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index d3808da..8d20e1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@actions/core": "^1.6.0", - "@cycjimmy/awesome-js-funcs": "^3.1.0", + "@cycjimmy/awesome-js-funcs": "^4.0.4", "@semantic-release/changelog": "^6.0.1", "@semantic-release/git": "^10.0.1", "semantic-release": "^19.0.2" @@ -121,9 +121,9 @@ } }, "node_modules/@cycjimmy/awesome-js-funcs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@cycjimmy/awesome-js-funcs/-/awesome-js-funcs-3.1.0.tgz", - "integrity": "sha512-FT+V5fSZoPAdEAo34FJFy5+DfhdoQ+s6cOmghjAUQzluM7NlUkPKUSFy5fzJHVJD2dofy8v2k3IIfgUXNiG2yw==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@cycjimmy/awesome-js-funcs/-/awesome-js-funcs-4.0.4.tgz", + "integrity": "sha512-SAkk1VmTubFDhrfMiBS8tNRV8ObGrXKnW7Wi27+KOM+1zPxomNxmF0wVBsxRTwI0tkeeELnxvfpFhHhk144sVg==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -5572,9 +5572,9 @@ } }, "@cycjimmy/awesome-js-funcs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@cycjimmy/awesome-js-funcs/-/awesome-js-funcs-3.1.0.tgz", - "integrity": "sha512-FT+V5fSZoPAdEAo34FJFy5+DfhdoQ+s6cOmghjAUQzluM7NlUkPKUSFy5fzJHVJD2dofy8v2k3IIfgUXNiG2yw==" + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@cycjimmy/awesome-js-funcs/-/awesome-js-funcs-4.0.4.tgz", + "integrity": "sha512-SAkk1VmTubFDhrfMiBS8tNRV8ObGrXKnW7Wi27+KOM+1zPxomNxmF0wVBsxRTwI0tkeeELnxvfpFhHhk144sVg==" }, "@nodelib/fs.scandir": { "version": "2.1.5", diff --git a/package.json b/package.json index 38f932c..c7dbfda 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "homepage": "https://github.com/cycjimmy/semantic-release-action#readme", "dependencies": { "@actions/core": "^1.6.0", - "@cycjimmy/awesome-js-funcs": "^3.1.0", + "@cycjimmy/awesome-js-funcs": "^4.0.4", "@semantic-release/changelog": "^6.0.1", "@semantic-release/git": "^10.0.1", "semantic-release": "^19.0.2" From 32ba2144e20cd7ee971eec9e71c340ec8f43f13c Mon Sep 17 00:00:00 2001 From: "Geoffrey.C" Date: Mon, 21 Mar 2022 11:01:20 +0800 Subject: [PATCH 2/3] build: fix cjs path --- src/handleOptions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/handleOptions.js b/src/handleOptions.js index 60e0f53..ebf8568 100644 --- a/src/handleOptions.js +++ b/src/handleOptions.js @@ -1,5 +1,5 @@ const core = require('@actions/core'); -const stringToJson = require('@cycjimmy/awesome-js-funcs/cjs/typeConversion/stringToJson').default; +const stringToJson = require('@cycjimmy/awesome-js-funcs/cjs/typeConversion/stringToJson.cjs').default; const inputs = require('./inputs.json'); /** From 46ed3f6eca8ca7534eb7356652dc64771e06cd5d Mon Sep 17 00:00:00 2001 From: "Geoffrey.C" Date: Mon, 21 Mar 2022 11:09:16 +0800 Subject: [PATCH 3/3] ci: modify ci tasks --- .github/workflows/release.yml | 20 +++++++++++++++++--- .github/workflows/testRelease.yml | 14 ++++---------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 693067a..6b22d5e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,12 +1,10 @@ name: Release on: - pull_request: - branches: - - master push: branches: - master + - main - next - next-major - alpha @@ -24,6 +22,22 @@ jobs: uses: ./ id: semantic with: + branches: | + [ + '+([0-9])?(.{+([0-9]),x}).x', + 'master', + 'main', + 'next', + 'next-major', + { + name: 'beta', + prerelease: true + }, + { + name: 'alpha', + prerelease: true + } + ] extra_plugins: | @semantic-release/git @semantic-release/changelog diff --git a/.github/workflows/testRelease.yml b/.github/workflows/testRelease.yml index ae1bb34..b09c173 100644 --- a/.github/workflows/testRelease.yml +++ b/.github/workflows/testRelease.yml @@ -1,17 +1,11 @@ name: Test Release on: - push: + pull_request: branches: - master - - next - - next-major - - alpha - - beta - - 'feat/**' - - 'fix/**' - - 'perf/**' - - 'refactor/**' + - main + push: schedule: - cron: 0 2 * * 0 @@ -33,6 +27,7 @@ jobs: [ '+([0-9])?(.{+([0-9]),x}).x', 'master', + 'main', 'next', 'next-major', { @@ -44,7 +39,6 @@ jobs: prerelease: true } ] - branch: master extra_plugins: | @semantic-release/git @semantic-release/changelog