One check

Author: hqpho

build/ci/cloudbuild.merge_test.yaml

@@ -13,6 +13,28 @@
 # limitations under the License.
 
 steps:
+  # Step 1: Set up environment variables based on the GitHub event.
+  # This step creates a file that other steps can source.
+  - name: "gcr.io/cloud-builders/gcloud" # Using a small, common image
+    id: "check-event-name"
+    entrypoint: "bash"
+    args:
+      - -c
+      - |
+        set -e
+        echo "Setting environment for event: $_GITHUB_EVENT_NAME"
+        if [[ -z "$_GITHUB_EVENT_NAME "]]; then
+          echo "Error: Expected \$_GITHUB_EVENT_NAME substitution."
+          echo "Please update the associated build trigger."
+          exit 1
+        fi
+        if [ "$_GITHUB_EVENT_NAME" = "merge_group" ]; then
+          echo "export IS_MERGE_QUEUE=true" > /workspace/env.sh
+        else
+          echo "export IS_MERGE_QUEUE=false" > /workspace/env.sh
+        fi
+    waitFor: ["-"]
+
   # Validate BQ version file and run golangci-lint
   - id: lint
     name: gcr.io/datcom-ci/full-env:${_FULL_ENV_VERSION}
@@ -21,13 +43,18 @@ steps:
       - -c
       - |
         set -e
+        source /workspace/env.sh
+        if [ "$IS_MERGE_QUEUE" = "false" ]; then
+          echo "Skipping build-proto for merge queue"
+          exit 0
+        fi
         c=`cat deploy/storage/bigquery.version | wc -l`
         if [ "$c" != "0" ]; then
           echo "bigquery.version should not have end of file newline"
           exit 1
         fi
         golangci-lint run -v
-    waitFor: ["-"]
+    waitFor: ["check-event-name"]
 
   # Validate feature flag yaml files
   - id: validate-feature-flags
@@ -37,8 +64,13 @@ steps:
       - -c
       - |
         set -e
+        source /workspace/env.sh
+        if [ "$IS_MERGE_QUEUE" = "false" ]; then
+          echo "Skipping validate-feature-flags for merge queue"
+          exit 0
+        fi
         ./scripts/check_flags.sh deploy/featureflags
-    waitFor: ["lint"]
+    waitFor: ["lint", "check-event-name"]
 
   # Build protobuf to go bindings
   - id: build-proto
@@ -48,24 +80,35 @@ steps:
       - -c
       - |
         set -e
+        source /workspace/env.sh
+        if [ "$IS_MERGE_QUEUE" = "false" ]; then
+          echo "Skipping build-proto for merge queue"
+          exit 0
+        fi
         protoc \
           --proto_path=proto \
           --go_out=paths=source_relative:internal/proto \
           --go-grpc_out=paths=source_relative:internal/proto \
           --go-grpc_opt=require_unimplemented_servers=false \
           --experimental_allow_proto3_optional \
           proto/*.proto proto/**/*.proto
-    waitFor: ["lint"]
+    waitFor: ["lint", "check-event-name"]
 
-  - id: test
-    name: gcr.io/datcom-ci/full-env:${_FULL_ENV_VERSION}
+    # Step 3: Runs the merge restriction check ONLY for merge queue events.
+  - name: "gcr.io/cloud-builders/git"
+    id: "enforce-flag-merge-restrictions"
     entrypoint: "bash"
     args:
       - -c
       - |
         set -e
-        go test -v ./...
-    waitFor: ["build-proto"]
+        source /workspace/env.sh
+        if [ "$IS_MERGE_QUEUE" = "true" ]; then
+          echo "Waiting to enforce flag restrictions until merge queue"
+          exit 0
+        fi
+        ./deploy/featureflags/enforce_merge_restrictions.sh deploy/featureflags
+    waitFor: ["check-event-name"]
 
 substitutions:
   _FULL_ENV_VERSION: "mixer-only-2025-10-02"