Skip to content

Commit

Permalink
Add win32 runner build to 23.lts.1+ (#869)
Browse files Browse the repository at this point in the history
Add win32 runner build to 23.lts.1+

b/288331647
  • Loading branch information
isarkis authored Jul 12, 2023
1 parent d9fa7e1 commit 0ca9d24
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/main_win.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ jobs:
uses: ./.github/actions/docker_win
with:
service: ${{ needs.initialize.outputs.docker_service }}
- name: Build runner docker image
id: build-runner-docker-image
uses: ./.github/actions/docker_win
with:
service: ${{ needs.initialize.outputs.docker_runner_service }}
# Runs builds.
build:
needs: [initialize]
Expand Down
11 changes: 11 additions & 0 deletions docker-compose-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,14 @@ services:
depends_on:
- cobalt-build-win32-base
image: cobalt-build-win-win32

runner-win-win32:
<<: *common-definitions
build:
context: ./docker/windows/runner
dockerfile: ./Dockerfile
args:
- RUNNER_VERSION=2.294.0
depends_on:
- cobalt-build-win32-base
image: cobalt-runner-win-win32
34 changes: 34 additions & 0 deletions docker/windows/runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright 2022 The Cobalt Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM cobalt-build-win32-base

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';$ProgressPreference='silentlyContinue';"]

ARG RUNNER_VERSION

RUN Invoke-WebRequest -Uri 'https://aka.ms/install-powershell.ps1' -OutFile install-powershell.ps1; \
powershell -ExecutionPolicy Unrestricted -File ./install-powershell.ps1 -AddToPath

RUN Invoke-WebRequest -Uri https://github.com/actions/runner/releases/download/v$env:RUNNER_VERSION/actions-runner-win-x64-$env:RUNNER_VERSION.zip -OutFile runner.zip; \
Expand-Archive -Path C:/runner.zip -DestinationPath C:/actions-runner; \
Remove-Item -Path C:\runner.zip; \
setx /M PATH $(${Env:PATH} + \";${Env:ProgramFiles}\Git\bin\")

# Required for packaging artifacts.
RUN choco install -f -y 7zip --version=19.0

ENV TMP "C:\Users\ContainerAdministrator\AppData\Local\Temp2"

ADD runner.ps1 C:/runner.ps1
CMD ["pwsh", "-ExecutionPolicy", "Unrestricted", "-File", ".\\runner.ps1"]
2 changes: 2 additions & 0 deletions docker/windows/runner/runner.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.\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;

0 comments on commit 0ca9d24

Please sign in to comment.