fix
parent
8875b32f01
commit
fd8599c0ac
|
|
@ -2108,13 +2108,7 @@ class RemoteBuilder {
|
||||||
const branchName = process.env.REMOTE_BUILDER_CACHE !== undefined ? process.env.REMOTE_BUILDER_CACHE : defaultBranchName;
|
const branchName = process.env.REMOTE_BUILDER_CACHE !== undefined ? process.env.REMOTE_BUILDER_CACHE : defaultBranchName;
|
||||||
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
||||||
const token = this.buildParams.githubToken;
|
const token = this.buildParams.githubToken;
|
||||||
this.defaultSecrets = [
|
RemoteBuilder.newMethod(token);
|
||||||
{
|
|
||||||
ParameterKey: 'GithubToken',
|
|
||||||
EnvironmentVariable: 'GITHUB_TOKEN',
|
|
||||||
ParameterValue: token,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
try {
|
try {
|
||||||
switch (this.buildParams.remoteBuildCluster) {
|
switch (this.buildParams.remoteBuildCluster) {
|
||||||
case 'aws':
|
case 'aws':
|
||||||
|
|
@ -2151,6 +2145,15 @@ class RemoteBuilder {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
static newMethod(token) {
|
||||||
|
this.defaultSecrets = [
|
||||||
|
{
|
||||||
|
ParameterKey: 'GithubToken',
|
||||||
|
EnvironmentVariable: 'GITHUB_TOKEN',
|
||||||
|
ParameterValue: token,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
static SetupStep(branchName) {
|
static SetupStep(branchName) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
core.info('Starting step 1/4 clone and restore cache)');
|
core.info('Starting step 1/4 clone and restore cache)');
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -2,6 +2,7 @@ import AWSBuildPlatform from './aws-build-platform';
|
||||||
import * as core from '@actions/core';
|
import * as core from '@actions/core';
|
||||||
import { BuildParameters } from '..';
|
import { BuildParameters } from '..';
|
||||||
import RemoteBuilderNamespace from './remote-builder-namespace';
|
import RemoteBuilderNamespace from './remote-builder-namespace';
|
||||||
|
import RemoteBuilderSecret from './remote-builder-secret';
|
||||||
import { RemoteBuilderProviderInterface } from './remote-builder-provider-interface';
|
import { RemoteBuilderProviderInterface } from './remote-builder-provider-interface';
|
||||||
import Kubernetes from './kubernetes-build-platform';
|
import Kubernetes from './kubernetes-build-platform';
|
||||||
const repositoryFolder = 'repo';
|
const repositoryFolder = 'repo';
|
||||||
|
|
@ -19,7 +20,7 @@ class RemoteBuilder {
|
||||||
private static libraryFolderFull: string;
|
private static libraryFolderFull: string;
|
||||||
private static buildId: string;
|
private static buildId: string;
|
||||||
private static buildParams: BuildParameters;
|
private static buildParams: BuildParameters;
|
||||||
private static defaultSecrets;
|
private static defaultSecrets: RemoteBuilderSecret[];
|
||||||
static RemoteBuilderProviderPlatform: RemoteBuilderProviderInterface;
|
static RemoteBuilderProviderPlatform: RemoteBuilderProviderInterface;
|
||||||
static async build(buildParameters: BuildParameters, baseImage) {
|
static async build(buildParameters: BuildParameters, baseImage) {
|
||||||
const runNumber = process.env.GITHUB_RUN_NUMBER;
|
const runNumber = process.env.GITHUB_RUN_NUMBER;
|
||||||
|
|
@ -39,13 +40,7 @@ class RemoteBuilder {
|
||||||
process.env.REMOTE_BUILDER_CACHE !== undefined ? process.env.REMOTE_BUILDER_CACHE : defaultBranchName;
|
process.env.REMOTE_BUILDER_CACHE !== undefined ? process.env.REMOTE_BUILDER_CACHE : defaultBranchName;
|
||||||
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
this.SteamDeploy = process.env.STEAM_DEPLOY !== undefined || false;
|
||||||
const token: string = this.buildParams.githubToken;
|
const token: string = this.buildParams.githubToken;
|
||||||
this.defaultSecrets = [
|
RemoteBuilder.newMethod(token);
|
||||||
{
|
|
||||||
ParameterKey: 'GithubToken',
|
|
||||||
EnvironmentVariable: 'GITHUB_TOKEN',
|
|
||||||
ParameterValue: token,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
try {
|
try {
|
||||||
switch (this.buildParams.remoteBuildCluster) {
|
switch (this.buildParams.remoteBuildCluster) {
|
||||||
case 'aws':
|
case 'aws':
|
||||||
|
|
@ -99,6 +94,16 @@ class RemoteBuilder {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static newMethod(token: string) {
|
||||||
|
this.defaultSecrets = [
|
||||||
|
{
|
||||||
|
ParameterKey: 'GithubToken',
|
||||||
|
EnvironmentVariable: 'GITHUB_TOKEN',
|
||||||
|
ParameterValue: token,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
private static async SetupStep(branchName: string | undefined) {
|
private static async SetupStep(branchName: string | undefined) {
|
||||||
core.info('Starting step 1/4 clone and restore cache)');
|
core.info('Starting step 1/4 clone and restore cache)');
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue