Merge branch 'main' into x509lib

dh2i-devs · May 14, 2024 · e0ec28d · e0ec28d
2 parents 6f14d4b + 05a97d3
commit e0ec28d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-      - release
-      - "maintenance/**"
 
 jobs:
   semantic-release:
@@ -21,11 +19,27 @@ jobs:
           dotnet-version: 8.x
 
       - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v3
+        uses: cycjimmy/semantic-release-action@v4
         with:
-          semantic_version: 19
+          semantic_version: 21
           extra_plugins: |
             semantic-release-net
+          branches: |
+            [
+              "main",
+              {
+                "name": "maintenance/7.x",
+                "range": "7.x"
+              },
+              {
+                "name": "maintenance/8.x",
+                "range": "8.x"
+              },
+              {
+                "name": "maintenance/9.x",
+                "range": "9.x"
+              }
+            ]
         env:
           DEBUG: semantic-release:*
           NUGET_API_KEY: ${{ secrets.NUGET_KEY }}

diff --git a/.releaserc.json b/.releaserc.json
@@ -1,24 +1,5 @@
 {
   "debug": true,
-  "branches": [
-    {
-      "name": "maintenance/7.x",
-      "range": "7.x"
-    },
-    {
-      "name": "maintenance/8.x",
-      "range": "8.x"
-    },
-    {
-      "name": "maintenance/9.x",
-      "range": "9.x"
-    },
-    {
-      "name": "main",
-      "prerelease": "pre"
-    },
-    "release"
-  ],
   "plugins": [
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",