Fix: No capitalization in build ids for k8s
parent
aaf15d9ad8
commit
7b6dce89e7
|
|
@ -1671,7 +1671,7 @@ const remote_builder_constants_1 = __importDefault(__webpack_require__(92560));
|
||||||
class RemoteBuilderNamespace {
|
class RemoteBuilderNamespace {
|
||||||
static generateBuildName(runNumber, platform) {
|
static generateBuildName(runNumber, platform) {
|
||||||
const nanoid = nanoid_1.customAlphabet(remote_builder_constants_1.default.alphabet, 4);
|
const nanoid = nanoid_1.customAlphabet(remote_builder_constants_1.default.alphabet, 4);
|
||||||
return `${runNumber}-${platform.replace('Standalone', '').replace('standalone', '')}-${nanoid()}`;
|
return `${runNumber}-${platform.toLowerCase().replace('standalone', '')}-${nanoid()}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
exports.default = RemoteBuilderNamespace;
|
exports.default = RemoteBuilderNamespace;
|
||||||
|
|
@ -1739,8 +1739,12 @@ class RemoteBuilder {
|
||||||
this.RemoteBuilderProviderPlatform = new kubernetes_build_platform_1.default(buildParameters);
|
this.RemoteBuilderProviderPlatform = new kubernetes_build_platform_1.default(buildParameters);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
const runNumber = process.env.GITHUB_RUN_NUMBER;
|
||||||
|
if (!runNumber || runNumber === '') {
|
||||||
|
throw new Error('no run number found, exiting');
|
||||||
|
}
|
||||||
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
||||||
const buildUid = remote_builder_namespace_1.default.generateBuildName(process.env.GITHUB_RUN_NUMBER, buildParameters.platform);
|
const buildUid = remote_builder_namespace_1.default.generateBuildName(runNumber, buildParameters.platform);
|
||||||
const defaultBranchName = ((_a = process.env.GITHUB_REF) === null || _a === void 0 ? void 0 : _a.split('/').filter((x) => {
|
const defaultBranchName = ((_a = process.env.GITHUB_REF) === null || _a === void 0 ? void 0 : _a.split('/').filter((x) => {
|
||||||
x = x[0].toUpperCase() + x.slice(1);
|
x = x[0].toUpperCase() + x.slice(1);
|
||||||
return x;
|
return x;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -2,9 +2,9 @@ import { customAlphabet } from 'nanoid';
|
||||||
import RemoteBuilderConstants from './remote-builder-constants';
|
import RemoteBuilderConstants from './remote-builder-constants';
|
||||||
|
|
||||||
class RemoteBuilderNamespace {
|
class RemoteBuilderNamespace {
|
||||||
static generateBuildName(runNumber, platform) {
|
static generateBuildName(runNumber: string | number, platform: string) {
|
||||||
const nanoid = customAlphabet(RemoteBuilderConstants.alphabet, 4);
|
const nanoid = customAlphabet(RemoteBuilderConstants.alphabet, 4);
|
||||||
return `${runNumber}-${platform.replace('Standalone', '').replace('standalone', '')}-${nanoid()}`;
|
return `${runNumber}-${platform.toLowerCase().replace('standalone', '')}-${nanoid()}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export default RemoteBuilderNamespace;
|
export default RemoteBuilderNamespace;
|
||||||
|
|
|
||||||
|
|
@ -25,11 +25,12 @@ class RemoteBuilder {
|
||||||
this.RemoteBuilderProviderPlatform = new Kubernetes(buildParameters);
|
this.RemoteBuilderProviderPlatform = new Kubernetes(buildParameters);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
const runNumber = process.env.GITHUB_RUN_NUMBER;
|
||||||
|
if (!runNumber || runNumber === '') {
|
||||||
|
throw new Error('no run number found, exiting');
|
||||||
|
}
|
||||||
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
||||||
const buildUid = RemoteBuilderNamespace.generateBuildName(
|
const buildUid = RemoteBuilderNamespace.generateBuildName(runNumber, buildParameters.platform);
|
||||||
process.env.GITHUB_RUN_NUMBER,
|
|
||||||
buildParameters.platform,
|
|
||||||
);
|
|
||||||
const defaultBranchName =
|
const defaultBranchName =
|
||||||
process.env.GITHUB_REF?.split('/')
|
process.env.GITHUB_REF?.split('/')
|
||||||
.filter((x) => {
|
.filter((x) => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue