[static] Merge remote-tracking branch 'origin/main' into isegall/snyk

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

Author: isegall-da

.github/actions/tests/pre_scala_test/action.yml

@@ -32,16 +32,15 @@ runs:
   using: "composite"
   steps:
     - name: Check if static only
+      uses: ./.github/actions/tests/skip_on_static
+      id: check
+
+    - name: Skip if static only
+      if: steps.check.outputs.skip == 'true'
       shell: bash
       run: |
-        last_commit_msg=$(git log -1 --pretty=%B)
-        echo "Last commit message: $last_commit_msg"
-        if [[ "${{ github.event_name }}" == "pull_request"* ]] && [[ "$last_commit_msg" == *"[static]"* ]]; then
-          echo "Only static tests should be running, skipping this job"
-          echo "skip=true" >> "$GITHUB_ENV"
-        else
-          echo "Not static-test-only, continuing"
-        fi
+        echo "Only static tests should be running, skipping this job"
+        echo "skip=true" >> "$GITHUB_ENV"
 
     - name: Check if skip regex matches
       if: ${{ inputs.skip_if_regex != '' }}

.github/actions/tests/skip_on_static/action.yml

@@ -0,0 +1,34 @@
+name: Check for static tests only
+description: |
+  This action checks if the current PR is only for static tests (via a commit flag ot a PR label).
+
+outputs:
+  skip:
+    description: "Set to true if the job should be skipped"
+    value: ${{ steps.check.outputs.skip }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Check if static only
+      id: check
+      shell: bash
+      run: |
+        last_commit_msg=$(git log -1 --pretty=%B)
+        pr_labels='${{ toJSON(github.event.pull_request.labels) }}'
+        static_label=$(echo "$pr_labels" | jq -r '.[] | select(.name == "static") | .name' | grep -c 'static' || true)
+        echo "Last commit message: $last_commit_msg"
+        if [[ "${{ github.event_name }}" == "pull_request"* ]]; then
+          if [[ "$last_commit_msg" == *"[static]"* ]] || [[ "$static_label" -gt 0 ]]; then
+            echo "Only static tests should be running"
+            echo "Last commit message is: $last_commit_msg"
+            echo "Static label count: $static_label (all labels: $pr_labels)"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "Not static-test-only"
+            echo "skip=false" >> "$GITHUB_OUTPUT"
+          fi
+        else
+          echo "Not a pull_request or pull_request_target event, not checking for static-test-only flag"
+          echo "skip=false" >> "$GITHUB_OUTPUT"
+        fi

.github/workflows/fork_labels.yml .github/workflows/assign_fork_prs.yml.github/workflows/fork_labels.yml renamed to .github/workflows/assign_fork_prs.yml

@@ -1,11 +1,11 @@
-name: Add labels to PRs from forks
+name: Auto-assign PRs from forks
 
 on:
   pull_request_target:
     types: [opened, reopened, edited]
 
 jobs:
-  add_labels:
+  assign:
     runs-on: self-hosted-docker-tiny
     if: github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     steps:
@@ -14,10 +14,9 @@ jobs:
         with:
           script: |
             const pr = context.payload.pull_request;
-            const labels = ['fork'];
-            await github.rest.issues.addLabels({
+            await github.rest.issues.addAssignees({
               issue_number: pr.number,
               owner: pr.base.repo.owner.login,
               repo: pr.base.repo.name,
-              labels: labels,
+              assignees: ['isegall-da', 'martinflorian-da', 'ray-roestenburg-da'],
             });

.github/workflows/build.daml_test.yml

@@ -4,8 +4,7 @@ on:
     inputs:
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
 
 jobs:
   daml_test:
@@ -20,20 +19,9 @@ jobs:
         with:
           ref: ${{ inputs.commit_sha }}
 
-      - name: Skip on [static]
+      - name: Check if static only
+        uses: ./.github/actions/tests/skip_on_static
         id: skip
-        shell: bash
-        run: |
-          git fetch origin ${{ github.event.pull_request.head.sha }}
-          last_commit_msg=$(git log -1 --pretty=%B ${{ github.event.pull_request.head.sha }})
-          echo "Last commit message: $last_commit_msg"
-
-          if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ github.event_name }}" == "pull_request_target" ]]; then
-            if [[ "$last_commit_msg" == *"[static]"* ]];  then
-              echo "Skipping Daml tests because of [static] label"
-              echo "skip=true" >> "$GITHUB_OUTPUT"
-            fi
-          fi
 
       - name: Setup
         if: steps.skip.outputs.skip != 'true'

.github/workflows/build.deployment_test.yml

@@ -4,8 +4,7 @@ on:
     inputs:
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
 
 jobs:
   deployment_test:

.github/workflows/build.docs.yml

@@ -4,8 +4,7 @@ on:
     inputs:
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
 
 jobs:
   docs:

.github/workflows/build.scala_test.yml

@@ -48,8 +48,7 @@ on:
         default: true
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
       daml_base_version:
         description: "Splice version from which the initial-package-config should be chosen"
         type: string

.github/workflows/build.scala_test_for_compose.yml

@@ -23,8 +23,7 @@ on:
         required: true
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
       daml_base_version:
         description: "Splice version from which the initial-package-config should be chosen"
         type: string

.github/workflows/build.scala_test_with_cometbft.yml

@@ -16,8 +16,7 @@ on:
         required: true
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
       daml_base_version:
         description: "Splice version from which the initial-package-config should be chosen"
         type: string

.github/workflows/build.static_tests.yml

@@ -4,8 +4,7 @@ on:
     inputs:
       commit_sha:
         type: string
-        required: false
-        default: ""
+        required: true
 
 
 jobs: