Merge remote-tracking branch 'origin/dev' into issue/OSOE-184-dev

Lombiq · Sep 20, 2022 · 4c39bb0 · 4c39bb0
2 parents 25d8949 + c7263b1
commit 4c39bb0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/.github/workflows/create-jira-issues-for-community-activities.yml b/.github/workflows/create-jira-issues-for-community-activities.yml
@@ -0,0 +1,23 @@
+name: Create Jira issues for community activities
+
+on:
+  discussion:
+    types: created
+  issues:
+    types: opened
+  pull_request:
+    types: opened
+
+jobs:
+  call-publish-workflow:
+    uses: Lombiq/GitHub-Actions/.github/workflows/create-jira-issues-for-community-activities.yml@dev
+    secrets:
+      JIRA_BASE_URL: ${{ secrets.DEFAULT_JIRA_BASE_URL }}
+      JIRA_USER_EMAIL: ${{ secrets.DEFAULT_JIRA_USER_EMAIL }}
+      JIRA_API_TOKEN: ${{ secrets.DEFAULT_JIRA_API_TOKEN }}
+      JIRA_PROJECT_KEY: ${{ secrets.DEFAULT_JIRA_PROJECT_KEY }}
+      DISCUSSION_JIRA_ISSUE_DESCRIPTION: ${{ secrets.DEFAULT_DISCUSSION_JIRA_ISSUE_DESCRIPTION }}
+      ISSUE_JIRA_ISSUE_DESCRIPTION: ${{ secrets.DEFAULT_ISSUE_JIRA_ISSUE_DESCRIPTION }}
+      PULL_REQUEST_JIRA_ISSUE_DESCRIPTION: ${{ secrets.DEFAULT_PULL_REQUEST_JIRA_ISSUE_DESCRIPTION }}
+    with:
+      issue-component: Lombiq.Hosting.Tenants
diff --git a/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj b/Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.1-alpha.walma-15.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj b/...IdleTenantManagement.Tests.UI/Lombiq.Hosting.Tenants.IdleTenantManagement.Tests.UI.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.Tests.UI" Version="3.5.0" />
+    <PackageReference Include="Lombiq.Tests.UI" Version="3.5.1-alpha.walma-15.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Manifest.cs b/Lombiq.Hosting.Tenants.IdleTenantManagement/Manifest.cs
@@ -1,4 +1,4 @@
-using OrchardCore.Modules.Manifest;
+using OrchardCore.Modules.Manifest;
 using static Lombiq.Hosting.Tenants.IdleTenantManagement.Constants.FeatureNames;
 
 [assembly: Module(
@@ -12,6 +12,7 @@
 [assembly: Feature(
     Id = DisableIdleTenants,
     Name = "Lombiq Hosting - Idle Tenant Management - Disable Idle Tenants",
+    Description = "Disable tenants not receiving requests after a configured amount of time.",
     Category = "Hosting",
     Priority = "9999",
     IsAlwaysEnabled = true,

diff --git a/Lombiq.Hosting.Tenants.IdleTenantManagement/Readme.md b/Lombiq.Hosting.Tenants.IdleTenantManagement/Readme.md
@@ -2,17 +2,17 @@
 
 ## About
 
-With the help of this module, you can ensure that any tenant where the feature is enabled will shutdown after a preset time is elapsed. This can be used to free up resources.
+With the help of this module, you can ensure that a tenant that didn't receive any requests for a configurable time will shut down. This can be used to free up resources and thus increase site density.
 
 ## Documentation
 
-This module contains one feature:
+This module contains the feature below.
 
 ### `Lombiq.Hosting.Tenants.IdleTenantManagement`
 
 This feature is available on any tenant. The maximum idle time can be set in the appsettings.json.
 
-**NOTE:** Any tenant can have its own set of maximum idle time, however on default there is only one global time set.
+**NOTE:** Any tenant can have its own set of maximum idle time, however by default there is only one global time set.
 
 ```csharp
 public void ConfigureServices(IServiceCollection services) =>

diff --git a/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj b/Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(NuGetBuild)' == 'true'">
-    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.0" />
+    <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="4.6.1-alpha.walma-15.1" />
   </ItemGroup>
 
 </Project>