Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: qiwi/multi-semantic-release
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.13.1
Choose a base ref
...
head repository: qiwi/multi-semantic-release
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.13.2
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Feb 9, 2021

  1. chore: remove package-lock since yarn is being used

    @davikawasaki @antongolub
    davikawasaki authored and antongolub committed Feb 9, 2021
    Copy the full SHA
    bf65e81 View commit details

  2. docs: ignore packages shouldn't stack below deps

    @davikawasaki @antongolub
    davikawasaki authored and antongolub committed Feb 9, 2021
    Copy the full SHA
    576fe27 View commit details

  3. fix: getVersionFromTag tests to fix release process

    @davikawasaki @antongolub
    davikawasaki authored and antongolub committed Feb 9, 2021
    Copy the full SHA
    e7f1646 View commit details

  4. fix: filter only tags that are valid

    @davikawasaki @antongolub
    davikawasaki authored and antongolub committed Feb 9, 2021
    Copy the full SHA
    59b61ad View commit details

  5. chore(release): 3.13.2 [skip ci] 

    ## [3.13.2](v3.13.1...v3.13.2) (2021-02-09)

### Bug Fixes

* filter only tags that are valid ([59b61ad](59b61ad))
* getVersionFromTag tests to fix release process ([e7f1646](e7f1646))
    @qiwibot
    qiwibot committed Feb 9, 2021
    Copy the full SHA
    cdd2f8b View commit details
Showing with 56 additions and 10,821 deletions.
  1. +8 −0 CHANGELOG.md
  2. +2 −2 README.md
  3. +10 −3 lib/updateDeps.js
  4. +0 −10,815 package-lock.json
  5. +1 −1 package.json
  6. +35 −0 test/lib/updateDeps.test.js
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## [3.13.2](https://github.com/qiwi/multi-semantic-release/compare/v3.13.1...v3.13.2) (2021-02-09)


### Bug Fixes

* filter only tags that are valid ([59b61ad](https://github.com/qiwi/multi-semantic-release/commit/59b61ad1a5823c24d7ff4237edf821fffb04abff))
* getVersionFromTag tests to fix release process ([e7f1646](https://github.com/qiwi/multi-semantic-release/commit/e7f16466bccc39311da8017dd5f0f7a8ae57686d))

## [3.13.1](https://github.com/qiwi/multi-semantic-release/compare/v3.13.0...v3.13.1) (2021-02-05)


4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -30,9 +30,9 @@ CLI flag options:
--debug Output debugging information.
--sequential-init Avoid hypothetical concurrent initialization collisions.
--first-parent Apply commit filtering to current branch only.
--deps.bump Define deps version updating rule. Allowed: override, satisfy, inherit.
--deps.release Define release type for dependent package if any of its deps changes. Supported values: patch, minor, major, inherit.
--ignore-packages Packages list to be ignored on bumping process (append to the ones that already exist at package.json workspaces)
--deps.bump Define deps version updating rule. Allowed: override, satisfy, inherit.
--deps.release Define release type for dependent package if any of its deps changes. Supported values: patch, minor, major, inherit.
--help Help info.

Examples
13 changes: 10 additions & 3 deletions lib/updateDeps.js
View file
Original file line number Diff line number Diff line change
@@ -27,10 +27,16 @@ const getNextVersion = (pkg) => {
*
* @param {Package} pkg Package object.
* @param {string} tag The tag containing the version to resolve
* @returns {string} The version of the package
* @returns {string|null} The version of the package or null if no tag was passed
* @internal
*/
const getVersionFromTag = (pkg, tag) => (pkg.name ? tag.replace(`${pkg.name}@`, "") : tag);
const getVersionFromTag = (pkg, tag) => {
if (!pkg.name) return tag || null;
if (!tag) return null;

const strMatch = tag.match(/[0-9].[0-9].[0-9].*/);
return strMatch && strMatch[0] && semver.valid(strMatch[0]) ? strMatch[0] : null;
};

/**
* Resolve next package version on prereleases.
@@ -61,7 +67,7 @@ const getNextPreVersion = (pkg, tags) => {
isNewPreRelTag || !lastVersion
? `1.0.0-${pkg._preRelease}.1`
: _nextPreVersionCases(
tags.map((tag) => getVersionFromTag(pkg, tag)),
tags.map((tag) => getVersionFromTag(pkg, tag)).filter((tag) => tag),
lastVersion,
pkg._nextType,
pkg._preRelease
@@ -328,4 +334,5 @@ module.exports = {
updateManifestDeps,
resolveReleaseType,
resolveNextVersion,
getVersionFromTag,
};
Loading