Merge pull request #21 from fairagro/feature/workflow

Feature/workflow

Author: Zalfsten

.github/workflows/create-merge-message-from-version-label.yml

@@ -0,0 +1,54 @@
+name: Add Version Info to Merge Commit
+
+on:
+  pull_request:
+    branches: [main]
+    types: [closed]
+
+permissions:
+  contents: write
+
+env:
+  GIT_USER_NAME: GitHub Pipeline
+  GIT_USER_EMAIL: [email protected]
+
+jobs:
+  add-merge-message:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout main
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+
+      # Prüfen des Labels für Version Bump
+      - name: Determine Version label
+        id: version-label
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const allowedLabels = ["major version","minor version","patch version"];
+            const pr = context.payload.pull_request;
+            const labels = pr.labels.map(l => l.name);
+            console.log("Labels on PR:", labels);
+            const matching = labels.filter(l => allowedLabels.includes(l));
+            console.log("Matching labels:", matching);
+            if (matching.length === 0) {
+              throw new Error("No version label found on the PR. Please add one of: " + allowedLabels.join(", "));
+            }
+            const result = matching[0].replace(" version","");
+            console.log("Determined version label:", result);
+            core.setOutput("result", result);
+
+      - name: Amend merge commit message
+        run: |
+          MERGE_COMMIT=$(git log -1 --merges --pretty=format:%H)
+          VERSION_LABEL=${{ steps.version-label.outputs.result }}
+          git config user.name "${{ env.GIT_USER_NAME }}"
+          git config user.email "${{ env.GIT_USER_EMAIL }}"
+          git commit --amend -m "$(git log -1 --pretty=%B) +semver: $VERSION_LABEL"
+          git push --force

.github/workflows/docker-build.yml

@@ -35,23 +35,6 @@ jobs:
           ref: ${{ github.ref }}
           fetch-depth: 0
 
-      # Prüfen des Labels für Version Bump
-      - name: Determine Version Bump
-        id: version-bump
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const allowedLabels = ["major version","minor version","patch version"];
-            const pr = context.payload.pull_request;
-            const labels = pr.labels.map(l => l.name);
-            console.log("Labels on PR:", labels);
-            const matching = labels.filter(l => allowedLabels.includes(l));
-            console.log("Matching labels:", matching);
-            const result = matching[0].replace(" version","");
-            console.log("Determined version bump:", result);
-            core.setOutput("bump", result);
-
       # GitVersion für main Merge
       - name: Install GitVersion
         uses: gittools/actions/gitversion/setup@v4
@@ -62,7 +45,8 @@ jobs:
         id: gitversion
         uses: gittools/actions/gitversion/execute@v4
         with:
-          configFilePath: GitVersion.${{ steps.version-bump.outputs.bump }}.yml
+          # configFilePath: GitVersion.${{ steps.version-bump.outputs.bump }}.yml
+          configFilePath: GitVersion.yml
 
       - name: Show calculated version
         run: |

GitVersion.yml

@@ -1,16 +1,18 @@
+workflow: GitHubFlow/v1
 tag-prefix: v
 
-branches:
-  main:
-    increment: Patch
-    # prevent-increment:
-    #   of-merged-branch: true
+# mode: ContinuousDelivery
+# tag-prefix: v
 
-  feature:
-    increment: Patch
-    source-branches: [main]
-    label: "{BranchName}"
-    prevent-increment:
-      of-merged-branch: true
-    regex: ^feature/(?<BranchName>.+)$
-    is-source-branch-for: []
+# branches:
+#   main:
+#     merge-message-strategy: MergeMessage
+
+#   feature:
+#     increment: Patch
+#     source-branches: [main]
+#     label: "{BranchName}"
+#     prevent-increment:
+#       of-merged-branch: true
+#     regex: ^feature/(?<BranchName>.+)$
+#     is-source-branch-for: []