Skip to content

Commit 91c6213

Browse files
committed
back to last commited code
1 parent 79e68ba commit 91c6213

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

lib/publish.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default async (pluginConfig, context) => {
2222
nextRelease: { gitTag, gitHead, notes, version },
2323
logger,
2424
} = context;
25-
const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes, packageName } =
25+
const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes } =
2626
resolveConfig(pluginConfig, context);
2727
const assetsList = [];
2828
const { projectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
@@ -75,6 +75,7 @@ export default async (pluginConfig, context) => {
7575
const filepath = asset.filepath ? template(asset.filepath)(context) : undefined;
7676
const target = asset.target ? template(asset.target)(context) : undefined;
7777
const status = asset.status ? template(asset.status)(context) : undefined;
78+
const packageName = asset.packageName ? template(asset.packageName)(context) : "release";
7879

7980
if (_url) {
8081
assetsList.push({ label, rawUrl: _url, type, filepath });
@@ -107,10 +108,9 @@ export default async (pluginConfig, context) => {
107108
let response;
108109

109110
if (target === "generic_package") {
110-
const pkgName = packageName ? template(packageName)(context) : "release";
111111
// Upload generic packages
112112
const encodedVersion = encodeURIComponent(version);
113-
const encodedPackageName = encodeURIComponent(pkgName);
113+
const encodedPackageName = encodeURIComponent(packageName);
114114
const fileName = pathlib.basename(path);
115115
const encodedLabel = encodeURIComponent(label ?? fileName);
116116
// https://docs.gitlab.com/ee/user/packages/generic_packages/#publish-a-package-file
@@ -136,7 +136,7 @@ export default async (pluginConfig, context) => {
136136
`packages/generic/${encodedPackageName}/${encodedVersion}/${encodedLabel}`
137137
);
138138

139-
assetsList.push({ label, alt: pkgName, url, type: "package", filepath });
139+
assetsList.push({ label, alt: packageName, url, type: "package", filepath });
140140

141141
logger.log("Uploaded file: %s (%s)", url, response.file.url);
142142
} else {

lib/resolve-config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export default (
1616
labels,
1717
assignee,
1818
retryLimit,
19-
packageName,
2019
},
2120
{
2221
envCi: { service } = {},
@@ -72,7 +71,6 @@ export default (
7271
assignee,
7372
retryLimit: retryLimit ?? DEFAULT_RETRY_LIMIT,
7473
retryStatusCodes: DEFAULT_RETRY_STATUS_CODES,
75-
packageName,
7674
};
7775
};
7876

0 commit comments

Comments
 (0)