Update runner.ps1

youtube · May 15, 2024 · 023f8df · 023f8df
1 parent c88ef08
commit 023f8df
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docker/windows/runner/runner.ps1 b/docker/windows/runner/runner.ps1
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-.\actions-runner\config.cmd --unattended --replace --url https://github.com/${env:RUNNER_REPO} --token $env:RUNNER_TOKEN --name $env:RUNNER_NAME --work $env:RUNNER_WORKDIR --labels $env:RUNNER_LABELS;
-.\actions-runner\run.cmd;
-=======
 C:\actions-runner\config.cmd --unattended --replace --url https://github.com/${env:RUNNER_REPO} --token $env:RUNNER_TOKEN --name $env:RUNNER_NAME --work $env:RUNNER_WORKDIR --ephemeral --labels $env:RUNNER_LABELS;
 C:\actions-runner\run.cmd;
->>>>>>> ae22bddb308 (Add --ephemeral option to win runner (#3239))