From 69d809ae4b8d40e34330cdce76b8a289f75425e6 Mon Sep 17 00:00:00 2001 From: AirryCo Date: Mon, 10 Feb 2025 18:51:18 +0800 Subject: [PATCH] update dev branch name to 3.11.x-dev --- .github/workflows/build-nightly-cron.yaml | 6 +++--- docker/Dockerfile-nightly | 2 +- docker/Dockerfile-nightly-fika | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index f981cb5..a447f15 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -11,8 +11,8 @@ env: SERVER_URL: https://github.com REPOSITORY_SPT_SERVER: sp-tarkov/server REPOSITORY_SPT_SERVER_AIRRYCO: AirryCo/spt-server - NIGHTLY_BRANCH: 4.0.x-DEV - NIGHTLY_BRANCH_FIKA: dev-4.0 + NIGHTLY_BRANCH: 3.11.x-DEV + NIGHTLY_BRANCH_FIKA: dev-3.11 jobs: prepare: @@ -35,7 +35,7 @@ jobs: - name: Get Latest Commit From SPT id: get-latest-commit run: | - branch_name=$(git ls-remote --heads https://github.com/sp-tarkov/server.git | grep -o 'refs/heads/4.0.0-DEV' | sed 's|refs/heads/||' | head -n 1) + branch_name=$(git ls-remote --heads https://github.com/sp-tarkov/server.git | grep -o 'refs/heads/3.11.0-dev' | sed 's|refs/heads/||' | head -n 1) SPT_SERVER_LATEST_COMMIT_HASH=$(git ls-remote ${{ env.SERVER_URL }}/${{ env.REPOSITORY_SPT_SERVER }}.git refs/heads/$branch_name | awk '{print $1}') SPT_SERVER_LATEST_COMMIT_HASH=${SPT_SERVER_LATEST_COMMIT_HASH:0:8} echo "👽 NIGHTLY_BRANCH_SPT = $branch_name" diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly index 40a3abe..f549445 100644 --- a/docker/Dockerfile-nightly +++ b/docker/Dockerfile-nightly @@ -1,6 +1,6 @@ FROM node:22.12.0-bullseye AS server-builder RUN apt update && apt install -y git git-lfs p7zip-full && \ - git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ + git clone -b 3.11.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ cd /snapshot && git lfs pull && \ cd project && \ npm install && npm run build:release && \ diff --git a/docker/Dockerfile-nightly-fika b/docker/Dockerfile-nightly-fika index 03a55b0..9582b4e 100644 --- a/docker/Dockerfile-nightly-fika +++ b/docker/Dockerfile-nightly-fika @@ -1,13 +1,13 @@ FROM node:22.12.0-alpine AS fika-builder RUN apk add --no-cache git unzip && \ - git clone -b dev-4.0 --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ + git clone -b dev-3.11 --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ cd /fika-server && \ npm install && npm run build && \ mkdir output && cd output && unzip /fika-server/dist/*.zip FROM node:22.12.0-bullseye AS server-builder RUN apt update && apt install -y git git-lfs p7zip-full && \ - git clone -b 4.0.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ + git clone -b 3.11.x-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ cd /snapshot && git lfs pull && \ cd project && \ npm install && npm run build:release && \