Skip to content

Commit c2b1a82

Browse files
committed
Fix path separators in build job.
1 parent c62fa3c commit c2b1a82

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

.github/workflows/build.yml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ on:
1010
workflow_dispatch:
1111
inputs:
1212
use_self_hosted_runners:
13-
description: 'Use Self-Hosted Runners'
13+
description: "Use Self-Hosted Runners"
1414
required: true
1515
default: false
1616
type: boolean
1717

1818
retention_days_artifacts:
19-
description: 'Retention Days for Artifacts'
19+
description: "Retention Days for Artifacts"
2020
required: false
2121
default: 1
2222
type: number
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup .NET
6969
uses: actions/setup-dotnet@v5
7070
with:
71-
dotnet-version: '10.x'
71+
dotnet-version: "10.x"
7272

7373
- name: Run Tests
7474
run: |
@@ -89,7 +89,7 @@ jobs:
8989
- name: Setup .NET
9090
uses: actions/setup-dotnet@v5
9191
with:
92-
dotnet-version: '10.x'
92+
dotnet-version: "10.x"
9393

9494
- name: Publish DesktopClient + Agent (ARM64)
9595
run: |
@@ -167,8 +167,7 @@ jobs:
167167
- name: Setup .NET
168168
uses: actions/setup-dotnet@v5
169169
with:
170-
dotnet-version: '10.x'
171-
170+
dotnet-version: "10.x"
172171

173172
- name: Pack ControlR.ApiClient (Release)
174173
run: dotnet build ControlR.ApiClient/ControlR.ApiClient.csproj -c Release -p:Version=${{ env.VERSION }}
@@ -291,7 +290,7 @@ jobs:
291290
- name: Setup .NET
292291
uses: actions/setup-dotnet@v5
293292
with:
294-
dotnet-version: '10.x'
293+
dotnet-version: "10.x"
295294

296295
- name: Build DesktopClient (linux-x64)
297296
run: |
@@ -328,7 +327,13 @@ jobs:
328327
build-web-server:
329328
name: Build Web Server
330329
runs-on: ${{ fromJson(inputs.use_self_hosted_runners) && fromJson('["self-hosted","Windows"]') || fromJson('["ubuntu-latest"]') }}
331-
needs: [build-windows-binaries, build-linux-binaries, build-mac-binaries, run-tests]
330+
needs:
331+
[
332+
build-windows-binaries,
333+
build-linux-binaries,
334+
build-mac-binaries,
335+
run-tests,
336+
]
332337

333338
steps:
334339
- name: Checkout
@@ -341,60 +346,60 @@ jobs:
341346
- name: Setup .NET
342347
uses: actions/setup-dotnet@v5
343348
with:
344-
dotnet-version: '10.x'
349+
dotnet-version: "10.x"
345350

346351
- name: Download Agent (win-x86)
347352
uses: actions/download-artifact@v6
348353
with:
349354
name: Agent-win-x86
350-
path: ControlR.Web.Server\wwwroot\downloads\win-x86\
355+
path: ControlR.Web.Server/wwwroot/downloads/win-x86/
351356

352357
- name: Download Agent (win-x64)
353358
uses: actions/download-artifact@v6
354359
with:
355360
name: Agent-win-x64
356-
path: ControlR.Web.Server\wwwroot\downloads\win-x64\
361+
path: ControlR.Web.Server/wwwroot/downloads/win-x64/
357362

358363
- name: Download Agent (linux-x64)
359364
uses: actions/download-artifact@v6
360365
with:
361366
name: Agent-linux-x64
362-
path: ControlR.Web.Server\wwwroot\downloads\linux-x64\
367+
path: ControlR.Web.Server/wwwroot/downloads/linux-x64/
363368

364369
- name: Download Agent (macOS ARM64)
365370
uses: actions/download-artifact@v6
366371
with:
367372
name: Agent-macOS-ARM64
368-
path: ControlR.Web.Server\wwwroot\downloads\osx-arm64\
373+
path: ControlR.Web.Server/wwwroot/downloads/osx-arm64/
369374

370375
- name: Download Agent (macOS x64)
371376
uses: actions/download-artifact@v6
372377
with:
373378
name: Agent-macOS-x64
374-
path: ControlR.Web.Server\wwwroot\downloads\osx-x64\
379+
path: ControlR.Web.Server/wwwroot/downloads/osx-x64/
375380

376381
- name: Create Version.txt
377382
shell: pwsh
378383
run: |
379-
Set-Content -Path "ControlR.Web.Server\wwwroot\downloads\Version.txt" -Value $env:VERSION -Force -Encoding UTF8
384+
Set-Content -Path "ControlR.Web.Server/wwwroot/downloads/Version.txt" -Value $env:VERSION -Force -Encoding UTF8
380385
381386
- name: Build Web Server
382387
shell: pwsh
383388
run: |
384-
New-Item -Path "ControlR.Web.Server\bin\publish" -ItemType Directory -Force | Out-Null
385-
dotnet publish ControlR.Web.Server\ -p:ExcludeApp_Data=true --runtime linux-x64 --configuration Release -p:Version=$env:VERSION -p:FileVersion=$env:VERSION --output ControlR.Web.Server\bin\publish --self-contained true
389+
New-Item -Path "ControlR.Web.Server/bin/publish" -ItemType Directory -Force | Out-Null
390+
dotnet publish ControlR.Web.Server/ -p:ExcludeApp_Data=true --runtime linux-x64 --configuration Release -p:Version=$env:VERSION -p:FileVersion=$env:VERSION --output ControlR.Web.Server/bin/publish --self-contained true
386391
387392
- name: Verify Agent Binaries
388393
shell: pwsh
389394
run: |
390395
$TestPaths = @(
391-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\Version.txt",
392-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\win-x86\ControlR.Agent.exe",
393-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\win-x64\ControlR.Agent.exe",
394-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\linux-x64\ControlR.Agent",
395-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\osx-arm64\ControlR.Agent",
396-
"ControlR.Web.Server\bin\publish\wwwroot\downloads\osx-x64\ControlR.Agent",
397-
"ControlR.Web.Server\bin\publish\novnc\vnc.html"
396+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/Version.txt",
397+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/win-x86/ControlR.Agent.exe",
398+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/win-x64/ControlR.Agent.exe",
399+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/linux-x64/ControlR.Agent",
400+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/osx-arm64/ControlR.Agent",
401+
"ControlR.Web.Server/bin/publish/wwwroot/downloads/osx-x64/ControlR.Agent",
402+
"ControlR.Web.Server/bin/publish/novnc/vnc.html"
398403
)
399404
foreach ($TestPath in $TestPaths) {
400405
if (!(Test-Path $TestPath)) {
@@ -407,12 +412,12 @@ jobs:
407412
uses: actions/upload-artifact@v4
408413
with:
409414
name: Server
410-
path: ControlR.Web.Server\bin\publish
415+
path: ControlR.Web.Server/bin/publish
411416
retention-days: ${{ env.RETENTION_DAYS_ARTIFACTS }}
412417

413418
- name: Upload docker-compose
414419
uses: actions/upload-artifact@v4
415420
with:
416421
name: DockerCompose
417-
path: docker-compose\docker-compose.yml
422+
path: docker-compose/docker-compose.yml
418423
retention-days: ${{ env.RETENTION_DAYS_ARTIFACTS }}

0 commit comments

Comments
 (0)