Tweaking 1

Author: marcoandries

.github/workflows/licensecheck.yml

@@ -15,57 +15,86 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Get push type
+        id: push-type
+        run: |
+            echo "Getting push type"
+            PUSH_TYPE='commit'
+            FETCH_DEPTH=10
+            if ${{ github.event.forced }} || ${{ github.event.before == '0000000000000000000000000000000000000000' }}; then
+                PUSH_TYPE='branch'
+                FETCH_DEPTH=0
+            fi
+            echo "Push type: $PUSH_TYPE"
+            echo "Fetch depth: $FETCH_DEPTH"
+            echo "push_type=$PUSH_TYPE" >> $GITHUB_OUTPUT
+            echo "fetch_depth=$FETCH_DEPTH" >> $GITHUB_OUTPUT
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
-         fetch-depth: 2
-      
-      - name: Get changes
+         fetch-depth: ${{ steps.push-type.outputs.fetch_depth }}
+
+      - name: Get changed files
         id: changed-files
         run: |
-            echo "Getting changed files from ${{ github.event.before }} to ${{ github.event.after }}"
-            if ${{ github.event.before == '0000000000000000000000000000000000000000' }}; then
-                git fetch origin develop
-                echo "changed_files=$(git diff --name-only remotes/origin/develop ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
+            if ${{ steps.push-type.outputs.push_type == 'branch'}}; then
+                echo "First commit on feature branch or force push - getting all changed files compared to 'develop'"
+                CHANGED_FILES=$(git diff --name-only remotes/origin/develop ${{ github.event.after }} | xargs)
             else
-                echo "changed_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT
+                echo "Getting changed files from ${{ github.event.before }} to ${{ github.event.after }}"
+                CHANGED_FILES=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)
             fi
+            for file in $CHANGED_FILES; do
+                echo "'$file' was changed"
+            done
+            echo "changed_files=$CHANGED_FILES" >> $GITHUB_OUTPUT
+
       - name: Process changed files
-        id: license-lines
+        id: process-files
         run: |
             LICENSE_LINES=''
             for file in ${{ steps.changed-files.outputs.changed_files }}; do
-              echo "$file was changed"
-              LICENSE_LINE="<$file>
-              $(cat $file | grep -Pzo '(<|")licensee("| )(\n|.)*(}|</licensee>)' | xargs)
-              "
-              LICENSE_LINES="$LICENSE_LINES
-              $LICENSE_LINE"
+              echo "Processing '$file'..."
+              LICENSE_MATCH=$(cat $file | grep -Pzo '(<|")licensee("| )(\n|.)*(}|</licensee>)' | xargs)
+              if [ -z "$LICENSE_MATCH" ]; then
+                echo "...no licenses found"
+              else
+                echo "license found!"
+                LICENSE_LINE="<$file>
+                $LICENSE_MATCH
+                "
+                LICENSE_LINES="$LICENSE_LINES
+                $LICENSE_LINE"
+              fi
             done
             {
                 echo 'license_lines<<EOF'
                 echo "${LICENSE_LINES}"
                 echo EOF
             } >> $GITHUB_OUTPUT
-      - name: List licenses found
-        run: echo "${{ steps.license-lines.outputs.license_lines }}"
 
-      - name: Remove commit if licenses found
-        id: remove-commit
+      - name: Remove commit/branch if licenses found
+        if: ${{ steps.process-files.outputs.license_lines != '' }}
+        id: remove-license
         run: |
-            BAD_COMMIT=''
-            if ${{ steps.license-lines.outputs.license_lines != '' }}; then
-                BAD_COMMIT="${{ github.event.after }}"
-                echo "Removing commit $BAD_COMMIT as it contains licenses"
+            if ${{ steps.push-type.outputs.push_type == 'commit'}}; then
+                echo "Removing commit ${{ github.event.after }} as it contains licenses"
                 git reset --hard ${{ github.event.before }}
                 git push origin ${{ github.ref }} --force-with-lease
+                echo "link=https://github.com/${{ github.repository }}/commits/${{ github.ref }}" >> $GITHUB_OUTPUT
+                echo "shortMsg=${{ github.event.after }} was removed!" >> $GITHUB_OUTPUT
+                echo "msg=Commit with message '${{ toJSON(github.event.head_commit.message) }}' `${{ github.event.after }}` was removed!" >> $GITHUB_OUTPUT
             else
-                echo "NOT Removing commit"
+                echo "Removing branch ${{ github.ref }} as it contains licenses"
+                git push origin --delete ${{ github.ref }}
+                echo "link=https://github.com/${{ github.repository }}/branches" >> $GITHUB_OUTPUT
+                echo "shortMsg='${{ github.ref }}' was removed!" >> $GITHUB_OUTPUT
+                echo "msg=Branch '${{ github.ref }}' was removed!" >> $GITHUB_OUTPUT
             fi
-            echo "bad_commit=$BAD_COMMIT" >> $GITHUB_OUTPUT
 
       - name: Find correspondences
-        if: ${{ steps.license-lines.outputs.license_lines != '' }}
+        if: ${{ steps.process-files.outputs.license_lines != '' }}
         id: email
         uses: slackapi/[email protected]
         with:
@@ -89,20 +118,20 @@ jobs:
           token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             "channel": "${{ env.SLACK_USER_ID }}",
-            "text": "Commit ${{ steps.remove-commit.outputs.bad_commit }} was removed!",
+            "text": "${{ steps.remove-license.outputs.shortMsg }}",
             "blocks": [
               {
                 "type": "section",
                 "text": {
                   "type": "mrkdwn",
-                  "text": ":alert-beam: <https://github.com/${{ github.repository }}/commits/${{ github.ref }}|*${{ github.repository }}>${{ github.ref }}*>: `${{ github.sha }}`"
+                  "text": ":alert: ${{ steps.remove-license.outputs.msg }} :alert:"
                 }
               },
               {
                 "type": "section",
                 "text": {
                   "type": "mrkdwn",
-                  "text": ${{ toJSON(github.event.head_commit.message) }}
+                  "text": "<${{ steps.remove-license.outputs.link }}>"
                 }
               }
             ]