Merge branch 'development' into release/222

planetarium · Dec 2, 2024 · c474d56 · c474d56
2 parents 7a1b4cc + d4b5c84
commit c474d56
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 1,405 deletions.
diff --git a/.github/workflows/push_docker_image.yml b/.github/workflows/push_docker_image.yml
@@ -76,14 +76,13 @@ jobs:
             --password '${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}'
       - name: push git tagged version
         run: |
-          docker pull ${{ matrix.docker.repo }}:git-${{ github.sha }}
           if [[ -z "${{ github.event.inputs.imageTag }}" ]]; then
             export IMAGE_TAG=${{ github.ref_name }}
           else
             export IMAGE_TAG=${{ github.event.inputs.imageTag }}
           fi
 
-          docker tag \
-            ${{ matrix.docker.repo }}:git-${{ github.sha }} \
-            ${{ matrix.docker.repo }}:$IMAGE_TAG
-          docker push ${{ matrix.docker.repo }}:$IMAGE_TAG
+          docker buildx imagetools create \
+            --progress=plain \
+            --tag ${{ matrix.docker.repo }}:$IMAGE_TAG \
+            ${{ matrix.docker.repo }}:git-${{ github.sha }}
diff --git a/NineChronicles.Headless.Executable.sln b/NineChronicles.Headless.Executable.sln
@@ -52,8 +52,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libplanet.Extensions.Plugge
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lib9c.Plugin.Shared", "Lib9c\.Lib9c.Plugin.Shared\Lib9c.Plugin.Shared.csproj", "{3D32DA34-E619-429F-8421-848FF4F14417}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NineChronicles.Headless.Executor", "NineChronicles.Headless.Executor\NineChronicles.Headless.Executor.csproj", "{59AD477A-B23C-4E0B-AA26-A528B3BC5234}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -463,30 +461,10 @@ Global
 		{3D32DA34-E619-429F-8421-848FF4F14417}.Release|x64.Build.0 = Release|Any CPU
 		{3D32DA34-E619-429F-8421-848FF4F14417}.Release|x86.ActiveCfg = Release|Any CPU
 		{3D32DA34-E619-429F-8421-848FF4F14417}.Release|x86.Build.0 = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|x64.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Debug|x86.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|Any CPU.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|Any CPU.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|x64.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|x64.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|x86.ActiveCfg = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.DevEx|x86.Build.0 = Debug|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|x64.ActiveCfg = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|x64.Build.0 = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|x86.ActiveCfg = Release|Any CPU
-		{59AD477A-B23C-4E0B-AA26-A528B3BC5234}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B4A2DD82-CCC1-4D74-88FF-91BBEBB5A47F}
 	EndGlobalSection

diff --git a/NineChronicles.Headless.Executable.sln.DotSettings b/NineChronicles.Headless.Executable.sln.DotSettings
@@ -41,8 +41,12 @@
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_NEW_PARENTHESES/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BETWEEN_ATTRIBUTE_SECTIONS/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_LIMIT/@EntryValue">300</s:Int64>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/PreferQualifiedReference/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AddImportsToDeepestScope/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/AllowAlias/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/CanUseGlobalAlias/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/PreferQualifiedReference/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/SortUsingsWithSystemFirst/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AI/@EntryIndexedValue">AI</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CRYSTAL/@EntryIndexedValue">CRYSTAL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GARAGE/@EntryIndexedValue">GARAGE</s:String>

diff --git a/NineChronicles.Headless.Executable/Program.cs b/NineChronicles.Headless.Executable/Program.cs
@@ -331,6 +331,7 @@ public async Task Run(
             try
             {
                 IHostBuilder hostBuilder = Host.CreateDefaultBuilder();
+                hostBuilder.ConfigureAppConfiguration(builder => builder.AddConfiguration(configuration));
 
                 var standaloneContext = new StandaloneContext
                 {

diff --git a/NineChronicles.Headless.Executor/Client/GithubClient.cs b/NineChronicles.Headless.Executor/Client/GithubClient.cs
diff --git a/NineChronicles.Headless.Executor/Client/HeadlessClient.cs b/NineChronicles.Headless.Executor/Client/HeadlessClient.cs
diff --git a/NineChronicles.Headless.Executor/Client/SettingsClient.cs b/NineChronicles.Headless.Executor/Client/SettingsClient.cs
diff --git a/NineChronicles.Headless.Executor/Constants/Paths.cs b/NineChronicles.Headless.Executor/Constants/Paths.cs
diff --git a/NineChronicles.Headless.Executor/Constants/Planet.cs b/NineChronicles.Headless.Executor/Constants/Planet.cs
diff --git a/NineChronicles.Headless.Executor/Constants/PlanetEndpoints.cs b/NineChronicles.Headless.Executor/Constants/PlanetEndpoints.cs
diff --git a/NineChronicles.Headless.Executor/Constants/Secret.cs b/NineChronicles.Headless.Executor/Constants/Secret.cs
-Original file line number
+Diff line change
@@ Expand Up / @@ -331,6 +331,7 @@ public async Task Run( @@
                 try
                 {
                     IHostBuilder hostBuilder = Host.CreateDefaultBuilder();
+                    hostBuilder.ConfigureAppConfiguration(builder => builder.AddConfiguration(configuration));
                     var standaloneContext = new StandaloneContext
                     {
@@ Expand Down @@