Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
SapiensAnatis committed Feb 16, 2024
1 parent 204750a commit 93d91e0
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
run: >
echo ${{ inputs.project }} | sed 's/.*\//name=/' >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v4
- name: Setup .NET Core SDK 7
- name: Setup .NET Core SDK 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ env:

jobs:
build:
name: Build
uses: ./.github/workflows/publish.yaml
with:
ref: main
dockerfile: "DragaliaAPI/DragaliaAPI/Dockerfile"
image-name: "dragalia-api"
secrets: inherit
deploy:
name: Deploy
needs: build
uses: ./.github/workflows/deploy.yaml
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-statemanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ env:

jobs:
build:
name: Build
uses: ./.github/workflows/publish.yaml
with:
ref: main
dockerfile: "PhotonStateManager/DragaliaAPI.Photon.StateManager/Dockerfile"
image-name: "photon-state-manager"
secrets: inherit
deploy:
name: Deploy
needs: build
uses: ./.github/workflows/deploy.yaml
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "test-report"

on:
workflow_run:
workflows: ["test"]
workflows: ["Test API", "Test PhotonStateManager"]
types:
- completed

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-statemanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ on:
- Directory.Packages.props

jobs:
integration-test:
name: Integration test
test:
name: Test
uses: ./.github/workflows/integration-test.yaml
with:
project: PhotonStateManager/DragaliaAPI.Photon.StateManager.Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: >
echo ${{ matrix.project }} | sed 's/.*\//name=/' >> "$GITHUB_OUTPUT"
- uses: actions/checkout@v4
- name: Setup .NET Core SDK 7
- name: Setup .NET Core SDK 8
uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"
Expand Down
1 change: 1 addition & 0 deletions DragaliaAPI/DragaliaAPI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
.AddJsonFile("dragonfruitOdds.json", optional: false, reloadOnChange: true)
.Build();

// Test
builder.WebHost.UseStaticWebAssets();

builder
Expand Down
3 changes: 0 additions & 3 deletions PhotonStateManager/DragaliaAPI.Photon.StateManager/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
using Serilog;
using StackExchange.Redis;

// test


WebApplicationBuilder builder = WebApplication.CreateBuilder(args);

Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
Expand Down

0 comments on commit 93d91e0

Please sign in to comment.