Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into outpost_turf_fix_2
Browse files Browse the repository at this point in the history
  • Loading branch information
tmtmtl30 committed Jan 6, 2024
2 parents 6aab15b + 6a115ba commit 56abfd5
Show file tree
Hide file tree
Showing 143 changed files with 51,626 additions and 659 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tgs_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
PR_NUMBER: ${{ github.event.number }}
jobs:
test_tgs_docker:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
if: ( !contains(github.event.head_commit.message, '[ci skip]') )
name: Test TGS Docker
runs-on: ubuntu-22.04
concurrency:
Expand All @@ -47,7 +47,7 @@ jobs:
env:
Database__DatabaseType: Sqlite
Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
General__ConfigVersion: 4.1.0
General__ConfigVersion: 5.0.0
General__ApiPort: ${{ env.TGS_API_PORT }}
General__SetupWizardMode: Never
ports:
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Setup dotnet
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Checkout Repository
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"**/.pnp.*": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"files.insertFinalNewline": true,
"gitlens.advanced.blame.customArguments": ["-w"],
"tgstationTestExplorer.project.resultsType": "json",
"[python]": {
"gitlens.codeLens.symbolScopes": ["!Module"],
"editor.wordBasedSuggestions": false,
"editor.wordBasedSuggestions": "off",
"editor.insertSpaces": true,
"editor.tabSize": 4
},
Expand Down
Loading

0 comments on commit 56abfd5

Please sign in to comment.