diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index 6b275d7..f19d505 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -60,7 +60,7 @@ jobs: SPT_COMMIT_ID=${{ steps.get-latest-commit.outputs.SPT_COMMIT_ID }} # Extract versions from core.json - wget https://raw.githubusercontent.com/${{ env.REPOSITORY_SPT_SERVER }}/refs/heads/${{ env.NIGHTLY_BRANCH }}/Libraries/SPTarkov.Server.Assets/Assets/configs/core.json + wget https://raw.githubusercontent.com/${{ env.REPOSITORY_SPT_SERVER }}/refs/heads/${{ env.NIGHTLY_BRANCH }}/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/core.json SPT_VERSION=$(jq -r '.sptVersion' core.json) CLIENT_VERSION=$(jq -r '.compatibleTarkovVersion' core.json) @@ -116,12 +116,12 @@ jobs: - name: Replace Background Image id: bg run: | - cp custom/bg.png /snapshot/Libraries/SPTarkov.Server.Assets/Assets/images/launcher/ + cp custom/bg.png /snapshot/Libraries/SPTarkov.Server.Assets/SPT_Data/images/launcher/ shell: bash - name: Replace projectName For Windows run: | - cd /snapshot/Libraries/SPTarkov.Server.Assets/Assets/configs + cd /snapshot/Libraries/SPTarkov.Server.Assets/SPT_Data/configs git checkout core.json sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Windows\",/g" core.json shell: bash @@ -134,7 +134,7 @@ jobs: - name: Replace projectName For Linux run: | - cd /snapshot/Libraries/SPTarkov.Server.Assets/Assets/configs + cd /snapshot/Libraries/SPTarkov.Server.Assets/SPT_Data/configs git checkout core.json sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Linux\",/g" core.json shell: bash diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly index 2468c4a..2524856 100644 --- a/docker/Dockerfile-nightly +++ b/docker/Dockerfile-nightly @@ -4,8 +4,8 @@ ARG SPT_BUILD_TYPE RUN apt update && apt install -y git git-lfs wget && \ git clone -b develop --depth=1 https://github.com/sp-tarkov/server-csharp.git /snapshot && \ cd /snapshot && git lfs pull && \ - cd Libraries/SPTarkov.Server.Assets/Assets/configs && sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Linux\",/g" core.json && \ - cd /snapshot/Libraries/SPTarkov.Server.Assets/Assets/images/launcher && rm bg.png && wget https://raw.githubusercontent.com/AirryCo/spt-server-ci/refs/heads/main/custom/bg.png && \ + cd Libraries/SPTarkov.Server.Assets/SPT_Data/configs && sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Linux\",/g" core.json && \ + cd /snapshot/Libraries/SPTarkov.Server.Assets/SPT_Data/images/launcher && rm bg.png && wget https://raw.githubusercontent.com/AirryCo/spt-server-ci/refs/heads/main/custom/bg.png && \ cd /snapshot && \ dotnet publish ./SPTarkov.Server/SPTarkov.Server.csproj -c Release -f net9.0 -r linux-x64 -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishSingleFile=true --self-contained false -p:SptBuildType=$SPT_BUILD_TYPE -p:SptVersion=$SPT_VERSION -p:SptBuildTime=$( date +%Y%m%d ) -p:SptCommit=$(git rev-parse --short HEAD) -p:IsPublish=true && \ rm SPTarkov.Server/bin/Release/net9.0/linux-x64/publish/*.pdb && \ diff --git a/docker/Dockerfile-nightly-arm64 b/docker/Dockerfile-nightly-arm64 index 7b7b0c4..c7a7af2 100644 --- a/docker/Dockerfile-nightly-arm64 +++ b/docker/Dockerfile-nightly-arm64 @@ -4,8 +4,8 @@ ARG SPT_BUILD_TYPE RUN apt update && apt install -y git git-lfs wget && \ git clone -b develop --depth=1 https://github.com/sp-tarkov/server-csharp.git /snapshot && \ cd /snapshot && git lfs pull && \ - cd Libraries/SPTarkov.Server.Assets/Assets/configs && sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Linux\",/g" core.json && \ - cd /snapshot/Libraries/SPTarkov.Server.Assets/Assets/images/launcher && rm bg.png && wget https://raw.githubusercontent.com/AirryCo/spt-server-ci/refs/heads/main/custom/bg.png && \ + cd Libraries/SPTarkov.Server.Assets/SPT_Data/configs && sed -i "s/\"projectName\": \"SPT\",/\"projectName\": \"AirryCo's SPT Linux\",/g" core.json && \ + cd /snapshot/Libraries/SPTarkov.Server.Assets/SPT_Data/images/launcher && rm bg.png && wget https://raw.githubusercontent.com/AirryCo/spt-server-ci/refs/heads/main/custom/bg.png && \ cd /snapshot && \ dotnet publish ./SPTarkov.Server/SPTarkov.Server.csproj -c Release -f net9.0 -r linux-arm64 -p:IncludeNativeLibrariesForSelfExtract=true -p:PublishSingleFile=true --self-contained false -p:SptBuildType=$SPT_BUILD_TYPE -p:SptVersion=$SPT_VERSION -p:SptBuildTime=$( date +%Y%m%d ) -p:SptCommit=$(git rev-parse --short HEAD) -p:IsPublish=true && \ rm SPTarkov.Server/bin/Release/net9.0/linux-arm64/publish/*.pdb && \