forked from ArchiDog1998/ActionTimelineEx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from BrakusTapus/1.3.6
edit
- Loading branch information
Showing
5 changed files
with
223 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| name: Build and Release | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| # Checks if commit contains word NEW or if manual dispatch | ||
| Check_Commit: | ||
| runs-on: windows-latest | ||
| steps: | ||
| - name: Check Commit Message | ||
| run: | | ||
| $eventName = '${{ github.event_name }}' | ||
| if ($eventName -eq 'workflow_dispatch') { | ||
| echo "Manual dispatch detected. Setting RUN_WORKFLOW to true." | ||
| echo "commit_contains_new=true" >> $GITHUB_ENV | ||
| } else { | ||
| $commitMessage = (Get-Content $env:GITHUB_EVENT_PATH | ConvertFrom-Json).head_commit.message | ||
| if ($commitMessage -like "*NEW*") { | ||
| echo "Commit message contains 'NEW'." | ||
| echo "commit_contains_new=true" >> $GITHUB_ENV | ||
| } else { | ||
| echo "Commit message does not contain 'NEW'." | ||
| echo "commit_contains_new=false" >> $GITHUB_ENV | ||
| } | ||
| } | ||
| shell: pwsh | ||
|
|
||
| # Extracts version number | ||
| Check_Version: | ||
| needs: Check_Commit | ||
| if: ${{ github.event_name == 'workflow_dispatch' || needs.Check_Commit.outputs.commit_contains_new == 'true' }} | ||
| runs-on: windows-latest | ||
| outputs: | ||
| current_version: ${{ steps.extract_versions.outputs.current_version }} | ||
| steps: | ||
| # Checkout repository | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| # Remove this after workflow is working | ||
| - name: List Directory Contents | ||
| run: | | ||
| Get-ChildItem -Recurse | ||
| shell: pwsh | ||
|
|
||
| # extract the version number from '.csproj' | ||
| - name: Extract version numbers | ||
| id: extract_versions # Add an id to this step to reference its outputs | ||
| working-directory: D:\a\ActionTimelineEx\ActionTimelineEx | ||
| run: | | ||
| $csprojPath = "./ActionTimelineEx.csproj" | ||
| $csprojXml = [xml](Get-Content $csprojPath) | ||
| $version = $csprojXml.Project.PropertyGroup.Version | ||
| echo "Project Version: $version" | ||
| echo "::set-output name=current_version::$version" | ||
| # build and release if the version number has been updated | ||
| build: | ||
| needs: Check_Version | ||
| runs-on: windows-latest | ||
| outputs: | ||
| current_version: ${{ steps.extract_versions.outputs.project_version }} | ||
| steps: | ||
| # Checkout repository | ||
| - name: Checkout Code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| # Remove this after workflow is working | ||
| - name: List Directory Contents | ||
| run: | | ||
| Get-ChildItem -Recurse | ||
| shell: pwsh | ||
|
|
||
| # extract the version number from '.csproj' | ||
| - name: Extract version numbers | ||
| working-directory: D:\a\ActionTimelineEx\ActionTimelineEx | ||
| run: | | ||
| $ActionTimelineExPath = "./ActionTimelineEx.csproj" | ||
| $ActionTimelineExXml = [xml](Get-Content $ActionTimelineExPath) | ||
| $ActionTimelineExVersion = $ActionTimelineExsXml.Project.PropertyGroup.Version | ||
| echo "Project 1 Version: $ActionTimelineExVersion" | ||
| # dunno if needed | ||
| - name: Check Version Against Latest Release | ||
| id: check_version | ||
| run: | | ||
| $latestReleaseTag = $(curl --silent "https://api.github.com/repos/${{ github.repository }}/releases/latest" | jq -r .tag_name) | ||
| $versionActionTimelineEx = "${{ steps.get_version.outputs.version_ActionTimelineEx }}" | ||
| if ($latestReleaseTag -eq $versionActionTimelineEx) { | ||
| echo "::set-output name=cancel::true" | ||
| } else { | ||
| echo "::set-output name=cancel::false" | ||
| } | ||
| shell: pwsh | ||
|
|
||
| # Sets up .NET | ||
| - name: Set up .NET | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| dotnet-version: 7.0.x | ||
|
|
||
| # Restore Dependencies | ||
| - name: Restore Dependencies | ||
| run: dotnet restore | ||
|
|
||
| # Download and extract Dalamud | ||
| - name: Download Dalamud | ||
| run: | | ||
| Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip | ||
| Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev" | ||
| # Builds ActionTimelineEx | ||
| - name: Build ActionTimelineEx | ||
| run: | | ||
| invoke-expression 'dotnet build --no-restore --configuration Release ActionTimelineEx' | ||
| # list directory contents | ||
| - name: List Directory Contents | ||
| run: | | ||
| Get-ChildItem -Recurse | ||
| shell: pwsh | ||
|
|
||
| # create release | ||
| - name: Create GitHub Release | ||
| id: create_release | ||
| uses: actions/create-release@v1 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| tag_name: v${{ needs.Check_Version.outputs.current_version }} | ||
| release_name: Release v${{ needs.Check_Version.outputs.current_version }} | ||
| draft: false | ||
| prerelease: false | ||
|
|
||
| # list directory contents | ||
| - name: List Directory Contents | ||
| run: | | ||
| Get-ChildItem -Recurse | ||
| shell: pwsh | ||
|
|
||
| # Upload Assets | ||
|
|
||
|
|
||
| # clean up on failure | ||
| - name: Cleanup on failure | ||
| if: failure() | ||
| run: | | ||
| gh release delete v${{ needs.Check_Version.outputs.current_version }} --yes | ||
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| shell: bash |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,52 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0-windows</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Authors>Kirbo</Authors> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| <Platforms>AnyCPU</Platforms> | ||
| <Version>1.3.6</Version> | ||
| <Nullable>enable</Nullable> | ||
| <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath> | ||
| <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <TargetFramework>net7.0-windows</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Authors>Kirbo</Authors> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| <Platforms>AnyCPU</Platforms> | ||
| <Version>1.3.6</Version> | ||
| <Nullable>enable</Nullable> | ||
| <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath> | ||
| <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> | ||
| <AllowUnsafeBlocks>true</AllowUnsafeBlocks> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="DalamudPackager" Version="2.1.12" /> | ||
| <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" /> | ||
| <ItemGroup> | ||
| <Compile Remove =".github\workflows\release-please.yml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="DalamudPackager" Version="2.1.12" /> | ||
| <ProjectReference Include="..\ECommons\ECommons\ECommons.csproj" /> | ||
|
|
||
| <Reference Include="Dalamud"> | ||
| <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="ImGui.NET"> | ||
| <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="ImGuiScene"> | ||
| <HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Lumina"> | ||
| <HintPath>$(DalamudLibPath)Lumina.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Lumina.Excel"> | ||
| <HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="FFXIVClientStructs"> | ||
| <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Newtonsoft.Json"> | ||
| <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| </ItemGroup> | ||
| <Reference Include="Dalamud"> | ||
| <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="ImGui.NET"> | ||
| <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="ImGuiScene"> | ||
| <HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Lumina"> | ||
| <HintPath>$(DalamudLibPath)Lumina.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Lumina.Excel"> | ||
| <HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="FFXIVClientStructs"> | ||
| <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| <Reference Include="Newtonsoft.Json"> | ||
| <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath> | ||
| <Private>False</Private> | ||
| </Reference> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
|
|
||
| name: ActionTimelineEx | ||
| author: Tischel, ArchiTed | ||
| author: Tischel, ArchiTed, Kirbo | ||
| description: |- | ||
| Configurable timeline display of all the actions you use. | ||
| punchline: Show your actions in real-time. | ||
| repo_url: https://github.com/ArchiDog1998/ActionTimelineEx | ||
| repo_url: https://github.com/BrakusTapus/ActionTimelineEx | ||
| icon_url: https://xivapi.com/i/000000/000073_hr1.png | ||
| dalamud_api_level: 9 | ||
| tags: | ||
| - UI | ||
| category_tags: | ||
| - UI | ||
| image_urls: | ||
| - https://raw.githubusercontent.com/ArchiDog1998/ActionTimelineEx/main/Images/example.gif | ||
| download_link_install: https://github.com/ArchiDog1998/ActionTimelineEx/releases/latest/download/latest.zip | ||
| download_link_update: https://github.com/ArchiDog1998/ActionTimelineEx/releases/latest/download/latest.zip | ||
| download_link_testing: https://github.com/ArchiDog1998/ActionTimelineEx/releases/latest/download/latest.zip | ||
| - https://raw.githubusercontent.com/BrakusTapus/ActionTimelineEx/main/Images/example.gif | ||
| download_link_install: https://github.com/BrakusTapus/ActionTimelineEx/releases/latest/download/latest.zip | ||
| download_link_update: https://github.com/BrakusTapus/ActionTimelineEx/releases/latest/download/latest.zip | ||
| download_link_testing: https://github.com/BrakusTapus/ActionTimelineEx/releases/latest/download/latest.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters