Skip to content

Commit

Permalink
ci: preview theme workflow fix (anuraghazra#2559)
Browse files Browse the repository at this point in the history
* Fix octokit error

* ci: make octokit instance global

* Fix preview theme (move declarations to global)

* refactor: make constants uppercase

---------

Co-authored-by: rickstaa <[email protected]>
  • Loading branch information
2 people authored and devantler committed May 1, 2023
1 parent 2c23b92 commit 77d37ca
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions scripts/preview-theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const INVALID_REVIEW_COMMENT = (commentUrl) =>

// Retrieve octokit instance.
const OCTOKIT = github.getOctokit(getGithubToken());
const PULL_REQUEST_ID = prNumber ? prNumber : getPrNumber();
const { OWNER, REPO } = getRepoInfo(github.context);

/**
* Retrieve PR number from the event payload.
Expand Down Expand Up @@ -315,29 +317,27 @@ export const run = async (prNumber) => {
\r${THEME_CONTRIB_GUIDELINESS}
`;
const ccc = new ColorContrastChecker();
const pullRequestId = prNumber ? prNumber : getPrNumber();
const commenter = getCommenter();
const { owner, repo } = getRepoInfo(github.context);
debug(`Owner: ${owner}`);
debug(`Repo: ${repo}`);
debug(`Owner: ${OWNER}`);
debug(`Repo: ${REPO}`);
debug(`Commenter: ${commenter}`);

// Retrieve the PR diff and preview-theme comment.
debug("Retrieve PR diff...");
const res = await OCTOKIT.pulls.get({
owner,
repo,
pull_number: pullRequestId,
OWNER,
REPO,
pull_number: PULL_REQUEST_ID,
mediaType: {
format: "diff",
},
});
debug("Retrieve preview-theme comment...");
const comment = await findComment(
OCTOKIT,
pullRequestId,
owner,
repo,
PULL_REQUEST_ID,
OWNER,
REPO,
commenter,
);

Expand Down Expand Up @@ -519,9 +519,9 @@ export const run = async (prNumber) => {
if (!DRY_RUN) {
comment_url = await upsertComment(OCTOKIT, {
comment_id: comment?.id,
issue_number: pullRequestId,
owner,
repo,
issue_number: PULL_REQUEST_ID,
OWNER,
REPO,
body: commentBody,
});
} else {
Expand All @@ -541,17 +541,17 @@ export const run = async (prNumber) => {
if (!DRY_RUN) {
await addReview(
OCTOKIT,
pullRequestId,
owner,
repo,
PULL_REQUEST_ID,
OWNER,
REPO,
reviewState,
reviewReason,
);
await addRemoveLabel(
OCTOKIT,
pullRequestId,
owner,
repo,
PULL_REQUEST_ID,
OWNER,
REPO,
"invalid",
!themesValid,
);
Expand All @@ -564,17 +564,17 @@ export const run = async (prNumber) => {
if (!DRY_RUN) {
await addReview(
OCTOKIT,
pullRequestId,
owner,
repo,
PULL_REQUEST_ID,
OWNER,
REPO,
"REQUEST_CHANGES",
error.message,
);
await addRemoveLabel(
OCTOKIT,
pullRequestId,
owner,
repo,
PULL_REQUEST_ID,
OWNER,
REPO,
"invalid",
true,
);
Expand Down

0 comments on commit 77d37ca

Please sign in to comment.