diff --git a/.github/local-actions/branch-manager/main.js b/.github/local-actions/branch-manager/main.js index d00da7f73..8040fca76 100644 --- a/.github/local-actions/branch-manager/main.js +++ b/.github/local-actions/branch-manager/main.js @@ -19734,6 +19734,17 @@ var require_semver = __commonJS({ } while (++i); } inc(release, identifier, identifierBase) { + if (release.startsWith("pre")) { + if (!identifier && identifierBase === false) { + throw new Error("invalid increment argument: identifier is empty"); + } + if (identifier) { + const match2 = `-${identifier}`.match(this.options.loose ? re[t.PRERELEASELOOSE] : re[t.PRERELEASE]); + if (!match2 || match2[1] !== identifier) { + throw new Error(`invalid identifier: ${identifier}`); + } + } + } switch (release) { case "premajor": this.prerelease.length = 0; @@ -19759,6 +19770,12 @@ var require_semver = __commonJS({ } this.inc("pre", identifier, identifierBase); break; + case "release": + if (this.prerelease.length === 0) { + throw new Error(`version ${this.raw} is not a prerelease`); + } + this.prerelease.length = 0; + break; case "major": if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0) { this.major++; @@ -19782,9 +19799,6 @@ var require_semver = __commonJS({ break; case "pre": { const base = Number(identifierBase) ? 1 : 0; - if (!identifier && identifierBase === false) { - throw new Error("invalid increment argument: identifier is empty"); - } if (this.prerelease.length === 0) { this.prerelease = [base]; } else { @@ -19919,13 +19933,12 @@ var require_diff = __commonJS({ if (!lowVersion.patch && !lowVersion.minor) { return "major"; } - if (highVersion.patch) { + if (lowVersion.compareMain(highVersion) === 0) { + if (lowVersion.minor && !lowVersion.patch) { + return "minor"; + } return "patch"; } - if (highVersion.minor) { - return "minor"; - } - return "major"; } const prefix = highHasPre ? "pre" : ""; if (v1.major !== v2.major) { diff --git a/.github/ng-renovate/package.json b/.github/ng-renovate/package.json index 34d097526..b0b56270a 100644 --- a/.github/ng-renovate/package.json +++ b/.github/ng-renovate/package.json @@ -3,6 +3,6 @@ "packageManager": "yarn@4.6.0", "type": "commonjs", "dependencies": { - "renovate": "39.140.2" + "renovate": "39.141.0" } } diff --git a/.github/ng-renovate/yarn.lock b/.github/ng-renovate/yarn.lock index a935417fc..c091d297f 100644 --- a/.github/ng-renovate/yarn.lock +++ b/.github/ng-renovate/yarn.lock @@ -5848,7 +5848,7 @@ __metadata: version: 0.0.0-use.local resolution: "ng-renovate@workspace:." dependencies: - renovate: "npm:39.140.2" + renovate: "npm:39.141.0" languageName: unknown linkType: soft @@ -6600,9 +6600,9 @@ __metadata: languageName: node linkType: hard -"renovate@npm:39.140.2": - version: 39.140.2 - resolution: "renovate@npm:39.140.2" +"renovate@npm:39.141.0": + version: 39.141.0 + resolution: "renovate@npm:39.141.0" dependencies: "@aws-sdk/client-codecommit": "npm:3.726.1" "@aws-sdk/client-ec2": "npm:3.726.1" @@ -6727,7 +6727,7 @@ __metadata: bin: renovate: dist/renovate.js renovate-config-validator: dist/config-validator.js - checksum: 10c0/ad859f8c9ff784b2a44d3bdd99516d9efe1bd5907174f12fca781450e897c0b32c538623f834f08ef5431f4d4f6932671871bce0fa58e7e193e58c988b6132bf + checksum: 10c0/6e138f7f9f4ee5fed6e5e810ebb75602d9016b024a593f5814216dc846a402031942a701a2ca79929992292964c2b579ce47960049310162ea0e3594e7a2260a languageName: node linkType: hard diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c5784c7ff..6b7c8299e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -27,10 +27,10 @@ jobs: - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Initialize CodeQL - uses: github/codeql-action/init@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7 + uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 with: languages: ${{ matrix.language }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@6e5455904168f98c75d8e5ad848b4dc4ab3ae77e # v3.28.7 + uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8 with: category: '/language:${{matrix.language}}' diff --git a/yarn.lock b/yarn.lock index ed691f721..f4201ee45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13870,7 +13870,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.6.3, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": +"semver@npm:7.6.3": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -13897,6 +13897,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4": + version: 7.7.0 + resolution: "semver@npm:7.7.0" + bin: + semver: bin/semver.js + checksum: 10c0/bcd1c03209b4be7d8ca86c976a0410beba7d4ec1d49d846a4be154b958db1ff5eaee50760c1d4f4070b19dee3236b8672d3e09642c53ea23740398bba2538a2d + languageName: node + linkType: hard + "semver@npm:~7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4"