diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index ec34920..a1ddbf2 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -129,7 +129,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.1 + image: refringe/spt-build-dotnet:0.0.4 steps: - name: Clone run: | @@ -152,13 +152,9 @@ jobs: - name: Extract Client Version run: | cd ./server-core/project/assets/configs - ClientVersion=$(pwsh -Command "& { - \$json = Get-Content -Path './core.json' | ConvertFrom-Json - \$version = \$json.compatibleTarkovVersion -split '\.' | Select-Object -Last 1 - Write-Output \$version - }") - echo "Extracted Client Version: $ClientVersion" - echo "::set-output name=client_version::$ClientVersion" + CLIENT_VERSION=$(jq -r '.compatibleTarkovVersion' core.json) + echo "Extracted Client Version: $CLIENT_VERSION" + echo "::set-output name=client_version::$CLIENT_VERSION" shell: bash build-launcher: @@ -166,7 +162,7 @@ jobs: if: needs.check-tag-exists.outputs.proceed == 'true' runs-on: ubuntu-latest container: - image: refringe/spt-build-dotnet:0.0.1 + image: refringe/spt-build-dotnet:0.0.4 steps: - name: Clone run: | diff --git a/Dockerfile.dotnet b/Dockerfile.dotnet index aa12a05..ae6f7ef 100644 --- a/Dockerfile.dotnet +++ b/Dockerfile.dotnet @@ -3,6 +3,6 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 # Install necessary tools and dependencies (git, zstd, wget, jq, and p7zip-full) RUN apt-get update && \ - apt-get install -y git zstd wget p7zip-full && \ + apt-get install -y git zstd wget jq p7zip-full && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*