From dcdfd3c403d4f06920af77445ad9f474d882bace Mon Sep 17 00:00:00 2001 From: Ava Chaney Date: Sun, 28 May 2023 23:41:33 -0700 Subject: [PATCH] chore: ci + readme fixes, make editorconfig consistent with usage in yml files (#1228) --- .editorconfig | 5 +++++ .github/workflows/tag-build.yml | 7 ++++++- README.md | 23 +++++++++++------------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.editorconfig b/.editorconfig index a0cd5584f..1b1377fca 100644 --- a/.editorconfig +++ b/.editorconfig @@ -140,3 +140,8 @@ indent_style = space indent_size = 4 tab_width = 4 dotnet_style_parentheses_in_other_operators=always_for_clarity:silent + +[*.{yaml,yml}] +indent_style = space +indent_size = 2 +tab_width = 2 diff --git a/.github/workflows/tag-build.yml b/.github/workflows/tag-build.yml index f367c2fc9..042630191 100644 --- a/.github/workflows/tag-build.yml +++ b/.github/workflows/tag-build.yml @@ -1,5 +1,10 @@ name: Tag Build -on: [push] +on: + push: + branches: + - master + tags-ignore: + - '*' # don't needlessly execute on tags jobs: tag: diff --git a/README.md b/README.md index f98961c3e..97dd4e9dd 100644 --- a/README.md +++ b/README.md @@ -26,23 +26,22 @@ Thanks to Mino, whose work has made this possible! These components are used in order to load Dalamud into a target process. Dalamud can be loaded via DLL injection, or by rewriting a process' entrypoint. -| Name | Purpose | -|---|---| -| *Dalamud.Injector.Boot* (C++) | Loads the .NET Core runtime into a process via hostfxr and kicks off Dalamud.Injector | -| *Dalamud.Injector* (C#) | Performs DLL injection on the target process | -| *Dalamud.Boot* (C++) | Loads the .NET Core runtime into the active process and kicks off Dalamud, or rewrites a target process' entrypoint to do so | -| *Dalamud* (C#) | Core API, game bindings, plugin framework | -| *Dalamud.CorePlugin* (C#) | Testbed plugin that can access Dalamud internals, to prototype new Dalamud features | +| Name | Purpose | +|-------------------------------|------------------------------------------------------------------------------------------------------------------------------| +| *Dalamud.Injector.Boot* (C++) | Loads the .NET Core runtime into a process via hostfxr and kicks off Dalamud.Injector | +| *Dalamud.Injector* (C#) | Performs DLL injection on the target process | +| *Dalamud.Boot* (C++) | Loads the .NET Core runtime into the active process and kicks off Dalamud, or rewrites a target process' entrypoint to do so | +| *Dalamud* (C#) | Core API, game bindings, plugin framework | +| *Dalamud.CorePlugin* (C#) | Testbed plugin that can access Dalamud internals, to prototype new Dalamud features | ## Branches We are currently working from the following branches. -| Name | Purpose | .NET Version | Track | -|---|---|---|---| -| *master* | Current release branch | .NET 6.0.3 (March 2022) | Release & Staging | -| *net7* | Upgrade to .NET 7 | .NET 7.0.0 (November 2022) | net7 | -| *api3* | Legacy version, no longer in active use | .NET Framework 4.7.2 (April 2017) | - | +| Name | API Level | Purpose | .NET Version | Track | +|----------|-----------|------------------------------------------------------------|----------------------------|-------------------| +| *master* | **8** | Current release branch | .NET 7.0.0 (November 2022) | Release & Staging | +| *v9* | **9** | Next major version, slated for release alongside Patch 6.5 | .NET 7.0.0 (November 2022) | v9 |