Skip to content

Commit 7de6fb5

Browse files
committed
add channelAsPkgName option
1 parent 72283df commit 7de6fb5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

lib/publish.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ export default async (pluginConfig, context) => {
2323
nextRelease: { gitTag, gitHead, notes, version, channel },
2424
logger,
2525
} = context;
26-
const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes } =
26+
const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes, channelAsPkgName } =
2727
resolveConfig(pluginConfig, context);
2828
const assetsList = [];
2929
const { projectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
3030

3131
const encodedGitTag = encodeURIComponent(gitTag);
32-
const encodedVersion = encodeURIComponent(version);
3332
const apiOptions = {
3433
headers: {
3534
"PRIVATE-TOKEN": gitlabToken,
@@ -111,9 +110,9 @@ export default async (pluginConfig, context) => {
111110
if (target === "generic_package") {
112111
// Upload generic packages
113112
const { major, minor, patch } = semver.parse(version);
114-
const encodedVersion = `${major}.${minor}.${patch}`;
113+
const encodedVersion = encodeURIComponent(channelAsPkgName ? `${major}.${minor}.${patch}` : version);
114+
const encodedChannel = encodeURIComponent(channelAsPkgName ? channel : "release");
115115
const encodedLabel = encodeURIComponent(label ?? version);
116-
const encodedChannel = encodeURIComponent(channel ?? "release");
117116
// https://docs.gitlab.com/ee/user/packages/generic_packages/#publish-a-package-file
118117
uploadEndpoint = urlJoin(
119118
projectApiUrl,

lib/resolve-config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export default (
1616
labels,
1717
assignee,
1818
retryLimit,
19+
channelAsPkgName,
1920
},
2021
{
2122
envCi: { service } = {},
@@ -50,6 +51,7 @@ export default (
5051
(service === "gitlab" && CI_PROJECT_URL && CI_PROJECT_PATH
5152
? CI_PROJECT_URL.replace(new RegExp(`/${CI_PROJECT_PATH}$`), "")
5253
: "https://gitlab.com");
54+
const DEFAULT_CHANNEL_AS_PKG_NAME = false
5355
return {
5456
gitlabToken: GL_TOKEN || GITLAB_TOKEN,
5557
gitlabUrl: defaultedGitlabUrl,
@@ -71,6 +73,7 @@ export default (
7173
assignee,
7274
retryLimit: retryLimit ?? DEFAULT_RETRY_LIMIT,
7375
retryStatusCodes: DEFAULT_RETRY_STATUS_CODES,
76+
channelAsPkgName: DEFAULT_CHANNEL_AS_PKG_NAME,
7477
};
7578
};
7679

0 commit comments

Comments
 (0)