Skip to content

Preview theme workflow fix #2559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 1, 2023
Merged

Preview theme workflow fix #2559

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97c0552
Fix octokit error
Zo-Bro-23 Mar 1, 2023
45eaa8d
ci: make octokit instance global
rickstaa Mar 1, 2023
2a11659
Fix preview theme (move declarations to global)
Zo-Bro-23 Mar 1, 2023
d7d1253
refactor: make constants uppercase
rickstaa Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions scripts/preview-theme.js
View file
Open in desktop
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