diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73749d0..d2e67c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,10 +14,10 @@ jobs: steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' @@ -35,7 +35,7 @@ jobs: run: | sudo apt-get install lua5.1 make check-scripts - make TREAT_WARNINGS_AS_ERRORS=true test + make test linux-mono: name: Linux (mono) @@ -43,7 +43,7 @@ jobs: steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Prepare Environment run: | @@ -59,7 +59,7 @@ jobs: - name: Check Mod run: | # check-scripts does not depend on .net/mono, so is not needed here - make RUNTIME=mono TREAT_WARNINGS_AS_ERRORS=true test + make RUNTIME=mono test windows: name: Windows (.NET 6.0) @@ -67,10 +67,10 @@ jobs: steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' @@ -85,6 +85,5 @@ jobs: run: | choco install lua --version 5.1.5.52 $ENV:Path = $ENV:Path + ";C:\Program Files (x86)\Lua\5.1\" - $ENV:TREAT_WARNINGS_AS_ERRORS = "true" .\make.ps1 check-scripts .\make.ps1 test diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 7a32f93..e410fcd 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -14,10 +14,10 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' @@ -42,13 +42,13 @@ jobs: macos: name: macOS Disk Image - runs-on: macos-11 + runs-on: macos-14 steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' @@ -81,10 +81,10 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Clone Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET 6.0 - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0.x' diff --git a/.vscode/launch.json b/.vscode/launch.json index 8e4482f..c451118 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,12 +2,12 @@ "version": "0.2.0", "configurations": [ { - "name": "Launch (Example)", + "name": "Launch (Sole Survivor)", "type": "coreclr", "request": "launch", "program": "${workspaceRoot}/engine/bin/OpenRA.dll", "args": [ - "Game.Mod=example", + "Game.Mod=ss", "Engine.EngineDir=${workspaceRoot}/engine", "Engine.ModSearchPaths=${workspaceRoot}/mods, ${workspaceRoot}/engine/mods", "Debug.DisplayDeveloperSettings=true",