merge up from merge-demo/mergequeue

.config/mq.toml

@@ -1,4 +1,5 @@
-mode = "singlequeue"
+mode = "parallelqueue"
+build = "bazel"
 
 [trunk]
 api = "api.trunk.io"
@@ -26,12 +27,13 @@ max_deps = 7
 max_impacted_deps = 2
 
 # rate at which PRs should simulate a logical merge conflict and need to be rejected
-logical_conflict_every = 1000
+logical_conflict_every = 100
 logical_conflict_file = "logical-conflict.txt"
 
 close_stale_after = "48 hours"
 
 [merge]
+trigger = "api"
 # label to apply to pull request to queue
 labels = ""
 # comment to post to queue

.github/workflows/factory.yaml

@@ -35,13 +35,15 @@ jobs:
 
       - name: run mq
         id: edits
-        run: ./mq generate
+        run: ./mq generate --gh-token=${{ secrets.GITHUB_TOKEN }} --trunk-token=${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          TRUNK_TOKEN: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
+          
       - name: run mq
         if: always()
         id: clean
-        run: ./mq housekeeping
+        run: ./mq housekeeping --gh-token=${{ secrets.GITHUB_TOKEN }} --trunk-token=${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TRUNK_TOKEN: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
+
+

.github/workflows/pr.yaml

@@ -19,7 +19,7 @@ jobs:
           repository: trunk-io/mergequeue-tool
           latest: true
           tarBall: true
-          preRelease: true
+          preRelease: false
           extract: true
 
       - name: Determine is_merge
@@ -37,6 +37,6 @@ jobs:
         # so we can simulate delay and flakiness
         if: steps.check_is_merge.outputs.on_merge == 'true'
         run: |
-          ./mq test-sim
+          ./mq test-sim --trunk-token=${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
         env:
           IS_MERGE: ${{ steps.check_is_merge.outputs.on_merge }}

.github/workflows/pr_targets.yaml

@@ -22,48 +22,50 @@ jobs:
           repository: trunk-io/mergequeue-tool
           latest: true
           tarBall: true
-          preRelease: true
+          preRelease: false
           extract: true
 
       - name: get demo config
         id: get-demo-config
         run: |
           output=$(./mq config)
           echo "$output" | jq -r '.mode'
-
-          echo "test=hello" >> "$GITHUB_OUTPUT"
-
-          echo "mode=$(echo "$output" | jq -r '.mode')" >> $GITHUB_ENV
           echo "mode=$(echo "$output" | jq -r '.mode')" >> $GITHUB_OUTPUT
-          echo "build=$(echo "$output" | jq -r '.build')" >> $GITHUB_ENV
-          echo "flake_rate=$(echo "$output" | jq -r '.flake_rate')" >> $GITHUB_ENV
-          echo "sleep_for=$(echo "$output" | jq -r '.sleep_for')" >> $GITHUB_ENV
+          echo "build=$(echo "$output" | jq -r '.build')" >> $GITHUB_OUTPUT
+          echo "flake_rate=$(echo "$output" | jq -r '.flake_rate')" >> $GITHUB_OUTPUT
+          echo "sleep_for=$(echo "$output" | jq -r '.sleep_for')" >> $GITHUB_OUTPUT
+        env:
+          TRUNK_TOKEN: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}          
 
-      - name: out
+      - name: mergeq queue configuration
         run: |
           echo 'mode ${{ steps.get-demo-config.outputs.mode }}'
-          echo 't ${{ steps.get-demo-config.outputs.test }}'
           echo 'build ${{ steps.get-demo-config.outputs.build }}'
 
       - name: bazel pr targets
-        uses: trunk-io/merge-action@v1
+        uses: trunk-io/merge-action@752cadfa168ce011c0fa396f4cbc6159ea445c02
         if:
           steps.get-demo-config.outputs.mode == 'parallelqueue' &&
           steps.get-demo-config.outputs.build == 'bazel'
         with:
           trunk-token: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
           bazel-workspace-path: bazel
+          bazel-diff-generate-hashes-extra-args: --no-excludeExternalTargets
           verbose: 1
         env:
-          API_URL: https://api.trunk-staging.io:443/v1/setImpactedTargets
+          API_URL: https://api.trunk.io:443/v1/setImpactedTargets
 
       - name: named pr targets
+        if:
+          steps.get-demo-config.outputs.mode == 'parallelqueue' &&
+          steps.get-demo-config.outputs.build != 'bazel'
         run: |
-          echo "::group::GitHub Json"
+          # uncomment if you want to see full github json
+          # echo "::group::GitHub Json"
           TEMP_FILE=$(mktemp)
           echo '${{ toJSON(github) }}' > $TEMP_FILE
           echo "::endgroup::"
-          ./mq upload-targets --github-json=$TEMP_FILE
+          ./mq upload-targets --github-json=$TEMP_FILE --trunk-token=${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
         env:
           TRUNK_TOKEN: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -9,3 +9,12 @@ mq.gz
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
+
+# Bazel output folders
+**/bazel-bin/
+**/bazel-out/
+**/bazel-testlogs/
+**/bazel-bazel/
+**/.bazel/
+
+venv/

.trunk/trunk.yaml

@@ -1,19 +1,19 @@
 version: 0.1
 cli:
-  version: 1.22.6
+  version: 1.24.0
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.3
+      ref: v1.7.0
       uri: https://github.com/trunk-io/plugins
     - id: configs
       uri: https://github.com/trunk-io/configs
-      ref: v1.0.8
+      ref: v1.1.0
 runtimes:
   enabled:
-    - node@18.12.1
+    - node@22.16.0
     - python@3.10.8
-    - rust@1.77.2
+    - rust@1.82.0
 
 actions:
   enabled:
@@ -24,4 +24,5 @@ actions:
 
 tools:
   enabled:
+    - bazel@8.2.1
     - jq@jq-1.7.1

bazel/.gitignore

@@ -0,0 +1,7 @@
+
+# Bazel output folders
+bazel-bin/
+bazel-out/
+bazel-testlogs/
+bazel-bazel/
+.bazel/

bazel/MODULE.bazel

@@ -0,0 +1,13 @@
+###############################################################################
+# Bazel now uses Bzlmod by default to manage external dependencies.
+# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
+#
+# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
+###############################################################################
+
+module(
+    name = "mergequeue",
+    version = "1.0.0",
+)
+
+bazel_dep(name = "rules_cc", version = "0.0.17")