diff --git a/.github/workflows/staging-deploy-pr.yml b/.github/workflows/staging-deploy-pr.yml index a7e308615773..7b7b5f5da1a5 100644 --- a/.github/workflows/staging-deploy-pr.yml +++ b/.github/workflows/staging-deploy-pr.yml @@ -79,9 +79,18 @@ jobs: name: prRepoName } } = run - const headLabel = `${prRepoOwner}:${headBranch}` const prIsInternal = owner === prRepoOwner && repo === prRepoName + let headLabel = `${prRepoOwner}:${headBranch}` + + // If the PR is external, prefix its head branch name with the + // forked repo owner's login and their fork repo name e.g. + // "octocat/my-fork:docs". We need to include the fork repo + // name as well to account for an API issue (this will work fine + // if they don't have a different fork repo name). + if (!prIsInternal) { + headLabel = `${prRepoOwner}/${prRepoName}:${headBranch}` + } // If the PR is external, prefix its head branch name with the // forked repo owner's login, e.g. "octocat:docs" diff --git a/package-lock.json b/package-lock.json index 6ef5ab1ab9dc..94990c7b34f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -138,7 +138,7 @@ "eslint-plugin-promise": "^5.1.0", "event-to-promise": "^0.8.0", "glob": "^7.2.0", - "graphql": "^15.5.3", + "graphql": "^15.6.1", "heroku-client": "^3.1.0", "http-status-code": "^2.1.0", "husky": "^7.0.2", @@ -161,7 +161,7 @@ "npm-merge-driver-install": "^2.0.1", "object-hash": "^2.2.0", "postcss": "^8.3.6", - "prettier": "^2.4.0", + "prettier": "^2.4.1", "replace": "^1.2.1", "rimraf": "^3.0.2", "robots-parser": "^2.3.0", @@ -11704,9 +11704,9 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, "node_modules/graphql": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.3.tgz", - "integrity": "sha512-sM+jXaO5KinTui6lbK/7b7H/Knj9BpjGxZ+Ki35v7YbUJxxdBCUqNM0h3CRVU1ZF9t5lNiBzvBCSYPvIwxPOQA==", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.6.1.tgz", + "integrity": "sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==", "dev": true, "engines": { "node": ">= 10.x" @@ -19783,9 +19783,9 @@ } }, "node_modules/prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", - "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -34916,9 +34916,9 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==" }, "graphql": { - "version": "15.5.3", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.5.3.tgz", - "integrity": "sha512-sM+jXaO5KinTui6lbK/7b7H/Knj9BpjGxZ+Ki35v7YbUJxxdBCUqNM0h3CRVU1ZF9t5lNiBzvBCSYPvIwxPOQA==", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.6.1.tgz", + "integrity": "sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==", "dev": true }, "gray-matter": { @@ -41080,9 +41080,9 @@ "dev": true }, "prettier": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", - "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", + "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", "dev": true }, "pretty-format": { diff --git a/package.json b/package.json index 1e8fb3c3a2a2..ed9ba37ad42a 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "eslint-plugin-promise": "^5.1.0", "event-to-promise": "^0.8.0", "glob": "^7.2.0", - "graphql": "^15.5.3", + "graphql": "^15.6.1", "heroku-client": "^3.1.0", "http-status-code": "^2.1.0", "husky": "^7.0.2", @@ -163,7 +163,7 @@ "npm-merge-driver-install": "^2.0.1", "object-hash": "^2.2.0", "postcss": "^8.3.6", - "prettier": "^2.4.0", + "prettier": "^2.4.1", "replace": "^1.2.1", "rimraf": "^3.0.2", "robots-parser": "^2.3.0",