fixed compilation after rebase
parent
2a6add4924
commit
fe464b5924
|
|
@ -229,6 +229,7 @@ class BuildParameters {
|
|||
androidKeyaliasName: input_1.default.androidKeyaliasName,
|
||||
androidKeyaliasPass: input_1.default.androidKeyaliasPass,
|
||||
customParameters: input_1.default.customParameters,
|
||||
sshAgent: input_1.default.sshAgent,
|
||||
chownFilesTo: input_1.default.chownFilesTo,
|
||||
remoteBuildCluster: input_1.default.remoteBuildCluster,
|
||||
awsStackName: input_1.default.awsStackName,
|
||||
|
|
@ -346,7 +347,7 @@ class Docker {
|
|||
}
|
||||
static run(image, parameters, silent = false) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const { version, workspace, runnerTempPath, platform, projectPath, buildName, buildPath, buildFile, buildMethod, buildVersion, androidVersionCode, androidKeystoreName, androidKeystoreBase64, androidKeystorePass, androidKeyaliasName, androidKeyaliasPass, customParameters, chownFilesTo, } = parameters;
|
||||
const { version, workspace, runnerTempPath, platform, projectPath, buildName, buildPath, buildFile, buildMethod, buildVersion, androidVersionCode, androidKeystoreName, androidKeystoreBase64, androidKeystorePass, androidKeyaliasName, androidKeyaliasPass, customParameters, sshAgent, chownFilesTo, } = parameters;
|
||||
const command = `docker run \
|
||||
--workdir /github/workspace \
|
||||
--rm \
|
||||
|
|
@ -387,10 +388,13 @@ class Docker {
|
|||
--env RUNNER_TOOL_CACHE \
|
||||
--env RUNNER_TEMP \
|
||||
--env RUNNER_WORKSPACE \
|
||||
${sshAgent ? '--env SSH_AUTH_SOCK=/ssh-agent' : ''} \
|
||||
--volume "/var/run/docker.sock":"/var/run/docker.sock" \
|
||||
--volume "${runnerTempPath}/_github_home":"/root" \
|
||||
--volume "${runnerTempPath}/_github_workflow":"/github/workflow" \
|
||||
--volume "${workspace}":"/github/workspace" \
|
||||
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
|
||||
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
|
||||
${image}`;
|
||||
yield exec_1.exec(command, undefined, { silent });
|
||||
});
|
||||
|
|
@ -662,6 +666,9 @@ class Input {
|
|||
static get customParameters() {
|
||||
return core.getInput('customParameters') || '';
|
||||
}
|
||||
static get sshAgent() {
|
||||
return core.getInput('sshAgent') || '';
|
||||
}
|
||||
static get chownFilesTo() {
|
||||
return core.getInput('chownFilesTo') || '';
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -22,6 +22,7 @@ class BuildParameters {
|
|||
public androidKeyaliasName!: string;
|
||||
public androidKeyaliasPass!: string;
|
||||
public customParameters!: string;
|
||||
public sshAgent!: string;
|
||||
public remoteBuildCluster!: string;
|
||||
public awsStackName!: string;
|
||||
public kubeConfig!: string;
|
||||
|
|
|
|||
Loading…
Reference in New Issue