Merge branch 'main' into chore/INFRA-3067-ref-duplication

Author: jluque0101

.github/actions/check-skip-merge-queue/action.yml

@@ -38,11 +38,6 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-      with:
-        fetch-depth: 0
-
     - name: Get pull request details
       continue-on-error: true
       id: pr-details
@@ -90,15 +85,32 @@ runs:
     - name: Check if pull request is up-to-date with base branch
       continue-on-error: true
       id: up-to-date
-      shell: bash
+      uses: actions/github-script@v8
       env:
         BASE_REF: ${{ inputs.base-ref }}
         PR_BRANCH: ${{ steps.pr-details.outputs.pr-branch }}
         MERGE_QUEUE_POSITION: ${{ steps.pr-details.outputs.merge-queue-position }}
-      run: |
-        set -euo pipefail
-        if git merge-base --is-ancestor "origin/${BASE_REF}" "origin/${PR_BRANCH}" && [ "${MERGE_QUEUE_POSITION}" -eq 1 ]; then
-          echo "up-to-date=true" >> "$GITHUB_OUTPUT"
-        else
-          echo "up-to-date=false" >> "$GITHUB_OUTPUT"
-        fi
+      with:
+        github-token: ${{ inputs.github-token }}
+        script: |
+          const { BASE_REF, PR_BRANCH, MERGE_QUEUE_POSITION } = process.env;
+
+          if (parseInt(MERGE_QUEUE_POSITION, 10) !== 1) {
+            core.info(`Pull request is not first in the merge queue (position: ${MERGE_QUEUE_POSITION}).`);
+            core.setOutput('up-to-date', 'false');
+            return;
+          }
+
+          const comparison = await github.rest.repos.compareCommitsWithBasehead({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            basehead: `${BASE_REF}...${PR_BRANCH}`,
+          });
+
+          if (comparison.data.status === 'identical' || comparison.data.status === 'ahead') {
+            core.info(`Pull request branch "${PR_BRANCH}" is up-to-date with base branch "${BASE_REF}".`);
+            core.setOutput('up-to-date', 'true');
+          } else {
+            core.info(`Pull request branch "${PR_BRANCH}" is not up-to-date with base branch "${BASE_REF}".`);
+            core.setOutput('up-to-date', 'false');
+          }

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.2]
+
+### Fixed
+
+- Remove need for fetching repository by using GitHub API in skip merge queue check ([#204](https://github.com/MetaMask/github-tools/pull/204))
+
 ## [1.4.1]
 
 ### Fixed
@@ -82,7 +88,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Some inputs were renamed for consistency across actions.
 - Bump `actions/checkout` and `actions/setup-node` to `v6` ([#173](https://github.com/MetaMask/github-tools/pull/173))
 
-[Unreleased]: https://github.com/MetaMask/github-tools/compare/v1.4.1...HEAD
+[Unreleased]: https://github.com/MetaMask/github-tools/compare/v1.4.2...HEAD
+[1.4.2]: https://github.com/MetaMask/github-tools/compare/v1.4.1...v1.4.2
 [1.4.1]: https://github.com/MetaMask/github-tools/compare/v1.4.0...v1.4.1
 [1.4.0]: https://github.com/MetaMask/github-tools/compare/v1.3.0...v1.4.0
 [1.3.0]: https://github.com/MetaMask/github-tools/compare/v1.2.0...v1.3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/github-tools",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": true,
   "description": "Tools for interacting with the GitHub API to do metrics gathering",
   "repository": {