From c74a60cac64943c04bc6f5b8ee2a5f16519f280e Mon Sep 17 00:00:00 2001 From: Refringe Date: Fri, 7 Mar 2025 19:27:02 -0500 Subject: [PATCH 1/3] Update and rename build.yaml to analyze.yaml --- .github/workflows/{build.yaml => analyze.yaml} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename .github/workflows/{build.yaml => analyze.yaml} (89%) diff --git a/.github/workflows/build.yaml b/.github/workflows/analyze.yaml similarity index 89% rename from .github/workflows/build.yaml rename to .github/workflows/analyze.yaml index d8e5de95..1a05a59a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/analyze.yaml @@ -1,16 +1,15 @@ -name: Build +name: Analyze on: push: - branches: ["main"] - pull_request: - branches: ["*"] + branches: + - main jobs: build: - name: Build and Analyze + name: Build and analyze runs-on: windows-latest - + steps: - uses: actions/checkout@v4 with: @@ -42,6 +41,6 @@ jobs: - name: Build and analyze shell: powershell run: | - .\.sonar\scanner\dotnet-sonarscanner begin /k:"sp-tarkov_server-csharp_65d8d534-f5f5-4c24-ba01-a033b1ec3db8" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="${{ secrets.SONAR_HOST_URL }}" + .\.sonar\scanner\dotnet-sonarscanner begin /k:"sp-tarkov_server-csharp_dfe3a8fe-1265-4804-ad36-d0c40dd466e6" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="${{ secrets.SONAR_HOST_URL }}" dotnet build .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}" From 90e6e88330bcf7a80eb832633bbe5f5cfa5af629 Mon Sep 17 00:00:00 2001 From: Chomp Date: Tue, 1 Apr 2025 20:47:48 +0100 Subject: [PATCH 2/3] Updated readme (cherry picked from commit 500b173eb37104c8a00bc43507a2696af538d14b) --- .github/README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/README.md b/.github/README.md index 4bae581c..0fd84114 100644 --- a/.github/README.md +++ b/.github/README.md @@ -2,7 +2,6 @@ This is the Server project for the Single Player Tarkov mod for Escape From Tarkov. It can be run locally to replicate responses to the modified Escape From Tarkov client -![Tests](https://github.com/sp-tarkov/server-csharp/actions/workflows/test.yaml/badge.svg) # Table of Contents @@ -61,10 +60,8 @@ We're really excited that you're interested in contributing! Before submitting y - **master** The default branch used for the latest stable release. This branch is protected and typically is only merged with release branches. -- **4.0.0-DEV** +- **development** The main branch for server development. PRs should target this. -- **4.0.1-DEV** - Development for the next hotfix release. Hotfix releases include bug fixes and minor features that do not affect the coding structure of the project. Special care is taken to not break server mod stability. These always target the same version of EFT as the last minor release. ### Pull Request Guidelines @@ -81,7 +78,7 @@ We're really excited that you're interested in contributing! Before submitting y ### Style Guide - TODO: add style guidance + TODO: style guidance Ensure that your code is automatically formatted whenever you save a file. ### Tests From 03ae7431f9fa39a1effaec09a28da192c25c4f02 Mon Sep 17 00:00:00 2001 From: Chomp Date: Wed, 2 Apr 2025 10:11:47 +0100 Subject: [PATCH 3/3] Added missing event banners