@uxf/scripts 11.78.0 → 11.80.4

package/README.md

@@ -79,4 +79,4 @@ Options
 
 Options:
       --version  Show version number
-```
+```

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/scripts",
-    "version": "11.78.0",
+    "version": "11.80.4",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/GitLab.js

@@ -33,14 +33,14 @@ async function getAll(url, config) {
     return data;
 }
 
-async function loadCommits(from) {
+async function loadCommits(from, ref_name = "master") {
     const commits = [];
 
     let nextPage = "1";
     do {
         const response = await axios.get(`/projects/${env.CI_PROJECT_ID}/repository/commits`, {
             params: {
-                ref_name: "master",
+                ref_name,
                 since: from ? dayjs(from).toISOString() : undefined,
                 per_page: "100",
                 page: nextPage,
@@ -80,20 +80,30 @@ async function findMigrationFiles(commits) {
     return migrationList;
 }
 
-async function getLastTag(tagPrefix = "release-") {
-    const response = await axios.get(`/projects/${env.CI_PROJECT_ID}/repository/tags`, {
+async function getLastTag(tagPrefix = "release-", ref_name = "master") {
+    const { data: commits } = await axios.get(`/projects/${env.CI_PROJECT_ID}/repository/commits`, {
+        params: {
+            ref_name,
+            per_page: "100",
+        },
+    });
+
+    const commitIds = commits.map((commit) => commit.id);
+
+    const { data: tags } = await axios.get(`/projects/${env.CI_PROJECT_ID}/repository/tags`, {
         params: { search: `^${tagPrefix}` },
+        per_page: "100",
     });
 
-    const tags = response.data;
+    const tag = tags.find((tag) => commitIds.includes(tag.commit.id)) ?? null;
 
-    if (tags.length === 0) {
+    if (!tag) {
         console.log("- release tag not found");
         return null;
     }
 
-    console.log(`- last tag: ${tags[0].name}`);
-    return tags[0];
+    console.log(`- last tag: ${tag.name}`);
+    return tag;
 }
 
 async function createRelease(description, tagPrefix = "release-", dryRun = false) {

package/src/uxf-release/index.js

@@ -93,8 +93,8 @@ function generateMigrationWarning(migrationFiles = []) {
  * @param config {{dryRun?: boolean, channel?: string, messageTitle?: string, googleChatWebhook?: string, tagPrefix?: string}}
  */
 module.exports = async function (config) {
-    const lastTag = await GitLab.getLastTag(config.tagPrefix);
-    const commits = await GitLab.loadCommits(lastTag ? lastTag.commit.committed_date : null);
+    const lastTag = await GitLab.getLastTag(config.tagPrefix, "master");
+    const commits = await GitLab.loadCommits(lastTag ? lastTag.commit.committed_date : null, "master");
     const migrationFiles = await GitLab.findMigrationFiles(commits);
 
     const migrationWarning = generateMigrationWarning(migrationFiles);