Merge branch 'main' into task/system-text-json-migration

OrchardCMS · Jul 30, 2024 · 64b11ce · 64b11ce
2 parents 08018a8 + 4b9a10b
commit 64b11ce
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/publish-cloudsmith-tag.yml b/.github/workflows/publish-cloudsmith-tag.yml
@@ -0,0 +1,14 @@
+name: Publish to CloudSmith from tag
+
+on:
+  push:
+    tags:
+      - v*-preview.*
+
+jobs:
+  call-publish-workflow:
+    uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
+    with:
+      source: https://nuget.cloudsmith.io/orchardcore/commerce/v3/index.json
+    secrets:
+      API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
diff --git a/.github/workflows/publish-cloudsmith.yml b/.github/workflows/publish-cloudsmith.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-    tags:
-      - v*-preview-*
 
 jobs:
   call-publish-workflow:

diff --git a/OrchardCore.Commerce.sln b/OrchardCore.Commerce.sln
@@ -45,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
 		.github\workflows\publish-cloudsmith.yml = .github\workflows\publish-cloudsmith.yml
 		.github\workflows\publish-nuget.yml = .github\workflows\publish-nuget.yml
 		.github\workflows\validate-pull-request.yml = .github\workflows\validate-pull-request.yml
+		.github\workflows\publish-cloudsmith-tag.yml = .github\workflows\publish-cloudsmith-tag.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Commerce.ContentFields", "src\Modules\OrchardCore.Commerce.ContentFields\OrchardCore.Commerce.ContentFields.csproj", "{8027FB33-B110-48A2-9B71-89F1EA96EB67}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ on: @@
       push:
         branches:
           - main
-        tags:
-          - v*-preview-*
     jobs:
       call-publish-workflow:
@@ Expand Down @@