Merge branch 'master' into ci-job-token

Author: fgreinacher

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           cache: npm
           node-version: lts/*

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: "${{ matrix.node-version }}"
           cache: npm
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: "${{ matrix.node-version }}"
           cache: npm

lib/publish.js

@@ -55,31 +55,49 @@ export default async (pluginConfig, context) => {
   debug("milestones: %o", milestones);
 
   if (assets && assets.length > 0) {
+    const templatedAssets = assets.map((asset) => {
+      if (isPlainObject(asset)) {
+        const templatedAsset = { ...asset };
+        if (asset.path) {
+          templatedAsset.path = Array.isArray(asset.path)
+            ? asset.path.map((pattern) => template(pattern)(context))
+            : template(asset.path)(context);
+        }
+        templatedAsset.url = asset.url ? template(asset.url)(context) : asset.url;
+        templatedAsset.label = asset.label ? template(asset.label)(context) : asset.label;
+        templatedAsset.type = asset.type ? template(asset.type)(context) : asset.type;
+        templatedAsset.filepath = asset.filepath ? template(asset.filepath)(context) : asset.filepath;
+        templatedAsset.target = asset.target ? template(asset.target)(context) : asset.target;
+        templatedAsset.status = asset.status ? template(asset.status)(context) : asset.status;
+        templatedAsset.packageName = asset.packageName ? template(asset.packageName)(context) : asset.packageName;
+        return templatedAsset;
+      } else if (Array.isArray(asset)) {
+        // Handle array of glob patterns
+        return asset.map((pattern) => template(pattern)(context));
+      } else {
+        // String asset path
+        return template(asset)(context);
+      }
+    });
+
     // Skip glob if url is provided
-    const urlAssets = assets.filter((asset) => asset.url);
+    const urlAssets = templatedAssets.filter((asset) => asset.url);
     debug("url assets: %o", urlAssets);
     const globbedAssets = await getAssets(
       context,
-      assets.filter((asset) => !asset.url)
+      templatedAssets.filter((asset) => !asset.url)
     );
     debug("globbed assets: %o", globbedAssets);
     const allAssets = [...urlAssets, ...globbedAssets];
     debug("all assets: %o", allAssets);
 
     await Promise.all(
       allAssets.map(async (asset) => {
-        const path = template((isPlainObject(asset) ? asset : { path: asset }).path)(context);
-        const _url = asset.url ? template(asset.url)(context) : undefined;
-        const label = asset.label ? template(asset.label)(context) : undefined;
-        const type = asset.type ? template(asset.type)(context) : undefined;
-        const filepath = asset.filepath ? template(asset.filepath)(context) : undefined;
-        const target = asset.target ? template(asset.target)(context) : undefined;
-        const status = asset.status ? template(asset.status)(context) : undefined;
-        const packageName = asset.packageName ? template(asset.packageName)(context) : "release";
-
-        if (_url) {
-          assetsList.push({ label, rawUrl: _url, type, filepath });
-          debug("use link from release setting: %s", _url);
+        const path = isPlainObject(asset) ? asset.path : asset;
+
+        if (asset.url) {
+          assetsList.push({ label: asset.label, rawUrl: asset.url, type: asset.type, filepath: asset.filepath });
+          debug("use link from release setting: %s", asset.url);
         } else {
           const file = pathlib.resolve(cwd, path);
 
@@ -98,18 +116,19 @@ export default async (pluginConfig, context) => {
           }
 
           debug("file path: %o", path);
-          debug("file label: %o", label);
-          debug("file type: %o", type);
-          debug("file filepath: %o", filepath);
-          debug("file target: %o", target);
-          debug("file status: %o", status);
-          debug("package name: %o", packageName);
+          debug("file label: %o", asset.label);
+          debug("file type: %o", asset.type);
+          debug("file filepath: %o", asset.filepath);
+          debug("file target: %o", asset.target);
+          debug("file status: %o", asset.status);
+          debug("package name: %o", asset.packageName);
 
           let uploadEndpoint;
           let response;
 
-          if (target === "generic_package") {
-            const finalLabel = label ?? pathlib.basename(file);
+          if (asset.target === "generic_package") {
+            const finalLabel = asset.label ?? pathlib.basename(file);
+            const packageName = asset.packageName ?? "release";
             // Upload generic packages
             const encodedVersion = encodeURIComponent(version);
             const encodedPackageName = encodeURIComponent(packageName);
@@ -118,7 +137,7 @@ export default async (pluginConfig, context) => {
             uploadEndpoint = urlJoin(
               projectApiUrl,
               `packages/generic/${encodedPackageName}/${encodedVersion}/${encodedLabel}?${
-                status ? `status=${status}&` : ""
+                asset.status ? `status=${asset.status}&` : ""
               }select=package_file`
             );
 
@@ -137,7 +156,7 @@ export default async (pluginConfig, context) => {
               `packages/generic/${encodedPackageName}/${encodedVersion}/${encodedLabel}`
             );
 
-            assetsList.push({ label: finalLabel, alt: packageName, url, type: "package", filepath });
+            assetsList.push({ label: finalLabel, alt: packageName, url, type: "package", filepath: asset.filepath });
 
             logger.log("Uploaded file: %s (%s)", url, response.file.url);
           } else {
@@ -158,7 +177,7 @@ export default async (pluginConfig, context) => {
             const { alt, full_path } = response;
             const url = urlJoin(gitlabUrl, full_path);
 
-            assetsList.push({ label, alt, url, type, filepath });
+            assetsList.push({ label: asset.label, alt, url, type: asset.type, filepath: asset.filepath });
 
             logger.log("Uploaded file: %s", url);
           }