chore: revert old conventional (#5960)

SAP · Feb 21, 2025 · 0c4a4c2 · 0c4a4c2
1 parent e91fb31
commit 0c4a4c2
Show file tree

Hide file tree

Showing 4 changed files with 602 additions and 475 deletions.
diff --git a/.github/actions/bump-version/index.js b/.github/actions/bump-version/index.js
@@ -1,9 +1,4 @@
-let recommendedVersion;
-(async () => {
-    const module = await import('conventional-recommended-bump');
-    recommendedVersion = module.recommendedVersion || module.default;
-})();
-
+const recommendedVersion = require('conventional-recommended-bump');
 const semver = require('semver');
 const fs = require('fs');
 const core = require('@actions/core');
@@ -30,6 +25,7 @@ const TypeList = ['major', 'minor', 'patch'].reverse();
  */
 const getCurrentActiveType = version => TypeList.find(type => semver[type](version));
 
+
 /**
  * calculate the priority of release type,
  * major - 2, minor - 1, patch - 0
@@ -40,10 +36,6 @@ const getCurrentActiveType = version => TypeList.find(type => semver[type](versi
 const getTypePriority = type => TypeList.indexOf(type);
 
 const bumpedVersionType = async () => {
-    if (!recommendedVersion) {
-        throw new Error('recommendedVersion is not available');
-    }
-
     const release = await recommendedVersion({
         preset: {
             name: require.resolve('conventional-changelog-conventionalcommits'),
@@ -71,11 +63,7 @@ const getNewVersion = (release, currentVersion, prereleaseRequested) => {
     return semver.valid(release.releaseType) || semver.inc(currentVersion, release.releaseType, prereleaseRequested, 'rc');
 };
 
-const run = async () => {
-    while (!recommendedVersion) {
-        await new Promise(resolve => setTimeout(resolve, 100)); 
-    }
-
+const run = async() => {
     const release = await bumpedVersionType();
     core.info(`${release.reason}, therefore release type should be ${release.releaseType}`);
 
@@ -89,4 +77,4 @@ const run = async () => {
     core.setOutput('isPrerelease', semver.prerelease(newVersion) ? 'true' : 'false');
 };
 
-run();
+run();
diff --git a/.github/actions/generate-conventional-release-notes/index.js b/.github/actions/generate-conventional-release-notes/index.js
@@ -1,9 +1,4 @@
-let conventionalChangelog;
-(async () => {
-    const module = await import('conventional-changelog');
-    conventionalChangelog = module.default;
-})();
-
+const conventionalChangelog = require('conventional-changelog');
 const core = require('@actions/core');
 const through = require('through2');
 const closestVersion = require('./closest-version');
@@ -30,15 +25,11 @@ const generateChangelog = (fromVersion) => {
     });
 }
 
-const run = async () => {
-    while (!conventionalChangelog) {
-        await new Promise(resolve => setTimeout(resolve, 100));
-    }
-
+const run = async() => {
     const { closest, tagsTillClosest } = await closestVersion();
     deleteTags(tagsTillClosest);
     const generatedReleaseNotes = await generateChangelog(closest);
     core.setOutput('generatedReleaseNotes', generatedReleaseNotes);
 };
 
-run();
+run();