Skip to content

Commit

Permalink
Bump
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristopherHX authored Nov 13, 2024
1 parent 52e88ed commit 3def459
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- run: |
FROM ${{ runner.arch == 'x64' && '--platform=linux/amd64' || runner.arch == 'arm64' && '--platform=linux/arm64' }} mcr.microsoft.com/dotnet/sdk:6.0
COPY . ./
RUN dotnet msbuild src/dir.proj -t:GenerateConstant && dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0 -o /app
RUN dotnet msbuild src/dir.proj -t:GenerateConstant && dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0 -o /app
FROM mcr.microsoft.com/dotnet/aspnet:latest
COPY --from=0 /app/ /app/
ENTRYPOINT [ "dotnet", "/app/Runner.Client.dll" ]
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-dotnet@v3
with:
dotnet-version: '6.0.x'
dotnet-version: '8.0.x'
- name: GenerateConstant
run: dotnet msbuild ./dir.proj -t:GenerateConstant /p:RunnerVersion=$(Get-Content ./runnerversion) /p:PackageRuntime=any
shell: pwsh
working-directory: ./src
- name: Restore
run: dotnet restore /p:RuntimeFrameworkVersion=6.0.0
run: dotnet restore /p:RuntimeFrameworkVersion=8.0.0
shell: pwsh
working-directory: ./src/Runner.Client
- name: Build
id: build
run: |
$d = Get-Date
$version = $("$(gh release view --repo ${{ github.server_url }}/${{ github.repository }} --json tagName -t "{{.tagName}}")".TrimStart("v") + "-preview." + $d.Year + "." + $d.Month + "." + $d.Day + "." + $d.Hour + "." + $d.Minute + "." + $d.Second + "." + $ENV:GITHUB_RUN_ID)
dotnet build --no-restore -c Release /p:BUILD_OS=Any /p:Version=$version /p:RuntimeFrameworkVersion=6.0.0
dotnet build --no-restore -c Release /p:BUILD_OS=Any /p:Version=$version /p:RuntimeFrameworkVersion=8.0.0
echo "version=$version" > $env:GITHUB_OUTPUT
shell: pwsh
working-directory: ./src/Runner.Client
env:
GH_TOKEN: ${{ github.token }}
- name: Pack
run: |
dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=6.0.0 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
dotnet pack --no-restore -c Release --no-build /p:Version=${{steps.build.outputs.version}} /p:RuntimeFrameworkVersion=8.0.0 /p:RepositoryUrl=${{ github.server_url }}/${{ github.repository }}
shell: pwsh
working-directory: ./src/Runner.Client
- name: Upload Artifacts
Expand Down Expand Up @@ -73,14 +73,14 @@ jobs:
- macos-latest
dotnet-version:
# - '6.0.100'
- '6.0.x'
- '8.0.x'
image:
- ''
include:
- os: windows-2022
tag: ltsc2022
- os: ubuntu-latest
image: mcr.microsoft.com/dotnet/sdk:6.0-alpine3.15
image: mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20
shell: sh
runs-on: ${{matrix.os}}
container: ${{matrix.image}}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ This builds `Runner.Client`, `Runner.Server` and a modifed github actions runner
### Building a framework dependent and os independent executable
```
dotnet msbuild src/dir.proj -t:GenerateConstant
dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0
dotnet publish src/Runner.Client -c Release --no-self-contained -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0
```
#### To run the package on a different Operating System
Expand Down Expand Up @@ -154,7 +154,7 @@ dotnet publish src/Runner.Client -c Release -r win-x64
### Building a dotnet tool
```
dotnet msbuild src/dir.proj -t:GenerateConstant
dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0
dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0
```
#### To install the package
```
Expand Down Expand Up @@ -577,7 +577,7 @@ act -W cache.yml --env ACTIONS_CACHE_URL=http://host.docker.internal:4555/
```
dotnet build ./src/Runner.Server/ /p:EFMigration=ON
dotnet ef migrations add --project ./src/Runner.Server/ --no-build PersistentJobs
dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0 -p:Version=3.4.0.3
dotnet pack src/Runner.Client -c Release -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0 -p:Version=3.4.0.3
dotnet tool update -g io.github.christopherhx.gharun --add-source src/Runner.Client/nupkg
```

Expand Down
2 changes: 1 addition & 1 deletion src/Runner.Service/Windows/RunnerService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<NoWarn>NU1701;NU1603;NU1605;CS4014;CA1416</NoWarn>
<RuntimeIdentifiers>win-x64;win-x86;win-arm;win-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/runner-server-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
]
},
"scripts": {
"build": "dotnet publish ../Runner.Language.Server --no-self-contained -p:UseAppHost=false -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=6.0.0 --output native"
"build": "dotnet publish ../Runner.Language.Server --no-self-contained -p:UseAppHost=false -p:BUILD_OS=Any -p:RuntimeFrameworkVersion=8.0.0 --output native"
},
"devDependencies": {
"@types/vscode": "^1.73.0",
Expand Down

0 comments on commit 3def459

Please sign in to comment.