Compare commits

..

15 Commits

Author SHA1 Message Date
杨黄林
2bb6f4497f Update BuildLauncher.yml 2026-01-11 23:35:21 +08:00
杨黄林
2aad592da7 Update Dockerfile 2026-01-11 23:32:10 +08:00
杨黄林
64d19ca401 Update Dockerfile 2026-01-11 23:28:32 +08:00
杨黄林
ab4288d289 Update Dockerfile for build parameters 2026-01-11 23:22:36 +08:00
杨黄林
22252d4539 Update Docker container to nightly SDK version 2026-01-11 23:18:22 +08:00
杨黄林
bd4c31d40d Update Dockerfile 2026-01-11 23:15:44 +08:00
杨黄林
6ca5b5d64a server改回develop分支 2025-12-17 12:53:00 +08:00
44d24bc2fc server改为main分支 2025-12-12 23:29:44 +08:00
987b71a6b3 改为main分支 2025-12-12 23:27:14 +08:00
f608e2ed38 变更镜像地址 2025-11-26 13:50:45 +08:00
yhl452493373
054caa7721 launcher构建镜像切换为微软的dotnet sdk 9.0 2025-11-22 16:32:38 +08:00
yhl452493373
1903273938 更换容器 2025-11-22 16:26:55 +08:00
yhl452493373
44ea36eff5 增加ubuntu-22.04 2025-11-22 16:19:07 +08:00
yhl452493373
1a54cfa2b9 更新工作流 2025-11-22 16:17:55 +08:00
yhl452493373
cd2f3a2d10 更新工作流 2025-11-22 16:17:22 +08:00
5 changed files with 24 additions and 11 deletions

View File

@@ -2,6 +2,16 @@ name: 构建启动器
on:
workflow_dispatch:
inputs:
runner_os:
description: 选择运行器系统
type: choice
required: true
default: 'ubuntu-latest'
options:
- ubuntu-latest
- ubuntu-24.04
- ubuntu-22.04
- ubuntu-host
build_modules:
description: '构建 Modules'
required: true
@@ -28,9 +38,9 @@ env:
MANAGED_ZIP_FILE: Managed.zip
jobs:
build-spt:
runs-on: ubuntu-latest
container: refringe/spt-build-dotnet:2.1.0
build-launcher:
runs-on: ${{ inputs.runner_os }}
container: mcr.microsoft.com/dotnet/sdk:10.0
defaults:
run:
shell: bash
@@ -233,4 +243,4 @@ jobs:
uses: christopherHX/gitea-upload-artifact@v4
with:
name: ${{ steps.file_info.outputs.zip_file_name }}
path: ${{ steps.file_info.outputs.zip_file_path }}
path: ${{ steps.file_info.outputs.zip_file_path }}

View File

@@ -11,6 +11,7 @@ on:
options:
- ubuntu-latest
- ubuntu-24.04
- ubuntu-22.04
- ubuntu-host
push_to_docker:
description: 推送到 Docker Hub
@@ -28,7 +29,7 @@ env:
jobs:
build-server:
runs-on: ${{ inputs.runner_os }}
runs-on: ${{ inputs.runner_os }}
steps:
- name: 检出代码

View File

@@ -2,7 +2,8 @@
# BUILD STAGE
# ================================
#FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build
FROM mcr.azure.cn/dotnet/sdk:9.0-alpine AS build
#FROM mcr.azure.cn/dotnet/sdk:9.0-alpine AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
ARG SPT_VERSION
ARG SPT_BUILD_TYPE
@@ -32,7 +33,8 @@ RUN dotnet publish ./SPTarkov.Server/SPTarkov.Server.csproj \
# RUNTIME STAGE
# ================================
#FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS final
FROM mcr.azure.cn/dotnet/aspnet:9.0-alpine AS final
#FROM mcr.azure.cn/dotnet/aspnet:9.0-alpine AS final
FROM mcr.microsoft.com/dotnet/aspnet:10.0-alpine AS final
ARG SPT_BUILD_CONFIG

View File

@@ -170,7 +170,7 @@ fi
chmod a+x bin/*
# 添加容器镜像和构建脚本
DOCKER_CMD="$DOCKER_CMD refringe/spt-build-dotnet:2.1.0"
DOCKER_CMD="$DOCKER_CMD mcr.microsoft.com/dotnet/sdk:9.0"
DOCKER_CMD="$DOCKER_CMD /build.sh"
DOCKER_CMD="$DOCKER_CMD \"$DATE_TIME\""
DOCKER_CMD="$DOCKER_CMD \"$SPT_VERSION\""
@@ -197,7 +197,7 @@ eval $DOCKER_CMD
# -v "./build.sh:/build.sh:ro" \
# -v "./bin/zip:/usr/bin/zip:ro" \
# -v "./bin/unzip:/usr/bin/unzip:ro" \
# refringe/spt-build-dotnet:2.1.0 \
# mcr.microsoft.com/dotnet/sdk:9.0 \
# /build.sh \
# "$DATE_TIME" \
# "$SPT_VERSION" \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
SPT_SERVER_REPOSITORY=sp-tarkov/server-csharp
SPT_SERVER_BRANCH=develop
SPT_SERVER_REPOSITORY="sp-tarkov/server-csharp"
SPT_SERVER_BRANCH="develop"
# 设置默认用户名,支持从参数传入
DOCKER_USERNAME="yhl452493373"