Skip to content

Commit 31c4878

Browse files
authored
Merge pull request #940 from FFXIV-CombatReborn/RotationLoadReowrk
Rotation load reowrk
2 parents c86b938 + cad55df commit 31c4878

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+564
-1780
lines changed

.github/workflows/publish.yaml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: windows-latest
1111
steps:
1212
- name: Checkout Repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v5
1414
with:
1515
submodules: true
1616

@@ -22,7 +22,6 @@ jobs:
2222
- name: Get Environment Variables
2323
run: |
2424
$tag = "${{ github.ref }}" -replace 'refs/tags/', ''
25-
2625
"tag=$tag" | Out-File -Append -FilePath $Env:GITHUB_ENV
2726
2827
- name: Set up .NET
@@ -35,20 +34,25 @@ jobs:
3534
Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
3635
Expand-Archive -Force latest.zip -DestinationPath "$env:AppData\XIVLauncher\addon\Hooks\dev"
3736
38-
- name: Restore Nuget Packages for Rotations
39-
run: dotnet restore RebornRotations/RebornRotations.csproj
40-
- name: Restore Nuget Packages for RSR
41-
run: dotnet restore RotationSolver/RotationSolver.csproj
37+
- name: Restore Dependencies
38+
run: |
39+
dotnet restore RotationSolver/RotationSolver.csproj
40+
dotnet restore RotationSolver.Basic/RotationSolver.Basic.csproj
4241
43-
- name: Build Rotations
44-
run: dotnet build --no-restore -c Release RebornRotations/RebornRotations.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:PackageVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
4542
- name: Build Plugin
46-
run: dotnet build --no-restore -c Release RotationSolver/RotationSolver.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:PackageVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
47-
- name: Push Nuget Package
48-
run: dotnet nuget push .\build\*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
43+
run: |
44+
dotnet build --no-restore -c Release RotationSolver/RotationSolver.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:PackageVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
45+
dotnet build --no-restore -c Release RotationSolver.Basic/RotationSolver.Basic.csproj --output .\build
46+
47+
# Only proceed with packaging if build succeeded
48+
- name: Create NuGet Package
49+
run: dotnet pack -c Release RotationSolver.Basic/RotationSolver.Basic.csproj --output .\build -p:PackageVersion=${{ env.tag }}
50+
51+
- name: Push NuGet Package
52+
run: dotnet nuget push .\build\*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json --skip-duplicate
4953

5054
- name: Zip Plugin
51-
run: Compress-Archive -Path .\build\* -DestinationPath .\build\RotationSolver.zip
55+
run: Compress-Archive -Path .\build\RotationSolver.dll,.\build\RotationSolver.Basic.dll -DestinationPath .\build\RotationSolver.zip
5256

5357
- name: Publish Plugin
5458
uses: softprops/action-gh-release@v2
@@ -61,10 +65,10 @@ jobs:
6165
dotnet pack -c Release RotationSolver.DocumentationGenerator/RotationSolver.DocumentationGenerator.csproj
6266
dotnet tool restore --add-source RotationSolver.DocumentationGenerator/nupkg
6367
- name: Build Docs
64-
run: dotnet tool run docgen build/RotationSolver.Basic.xml build/RebornRotations.xml
68+
run: dotnet tool run docgen build/RotationSolver.Basic.xml
6569
- name: Publish Docs
66-
uses: Andrew-Chen-Wang/github-wiki-action@v4
70+
uses: Andrew-Chen-Wang/github-wiki-action@v5
6771
with:
6872
token: ${{ secrets.GITHUB_TOKEN }}
6973
path: _doc/
70-
commit-message: Update wiki to ${{ env.tag }}
74+
commit-message: Update wiki to ${{ env.tag }}

RebornRotations/AssemblyInfo.cs

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)