From f9d7e03781dfe2ceb1d2578c87a64132c3ecfd6b Mon Sep 17 00:00:00 2001 From: AirryCo Date: Tue, 3 Dec 2024 15:50:16 +0800 Subject: [PATCH] branches fixed. --- .github/workflows/build-nightly-cron.yaml | 2 +- docker/Dockerfile-nightly | 2 +- docker/Dockerfile-nightly-fika | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-nightly-cron.yaml b/.github/workflows/build-nightly-cron.yaml index 4c91c9a..ce24059 100644 --- a/.github/workflows/build-nightly-cron.yaml +++ b/.github/workflows/build-nightly-cron.yaml @@ -12,7 +12,7 @@ env: REPOSITORY_SPT_SERVER: sp-tarkov/server REPOSITORY_SPT_SERVER_AIRRYCO: AirryCo/spt-server NIGHTLY_BRANCH: 3.10.x-DEV - NIGHTLY_BRANCH_FIKA: spt-3.10 + NIGHTLY_BRANCH_FIKA: main jobs: prepare: diff --git a/docker/Dockerfile-nightly b/docker/Dockerfile-nightly index c616445..035b15f 100644 --- a/docker/Dockerfile-nightly +++ b/docker/Dockerfile-nightly @@ -1,6 +1,6 @@ FROM node:20.11.1-bullseye AS server-builder RUN apt update && apt install -y git git-lfs p7zip-full && \ - git clone -b 3.10.0-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ + git clone -b 3.10.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 f3a6b87..27db680 100644 --- a/docker/Dockerfile-nightly-fika +++ b/docker/Dockerfile-nightly-fika @@ -1,13 +1,13 @@ FROM node:20.11.1-alpine AS fika-builder RUN apk add --no-cache git unzip && \ - git clone -b spt-3.10 --depth=1 https://github.com/project-fika/Fika-Server.git /fika-server && \ + git clone -b main --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/fika-server.zip FROM node:20.11.1-bullseye AS server-builder RUN apt update && apt install -y git git-lfs p7zip-full && \ - git clone -b 3.10.0-DEV --depth=1 https://github.com/AirryCo/spt-server.git /snapshot && \ + git clone -b 3.10.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 && \