From 53822087e91e380a8a4ab5b617faf9868f4a41a9 Mon Sep 17 00:00:00 2001 From: jpaul Date: Tue, 7 Nov 2023 16:28:38 +0100 Subject: [PATCH] fix octokit init --- dist/cleanup/index.js | 25 +++++++++++++++++++++---- dist/main/index.js | 25 +++++++++++++++++++++---- src/features/reports.ts | 15 +++++++++++---- 3 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index 7effb0c..0e56135 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -70684,9 +70684,8 @@ const INPUT_NI_JOB_REPORTS = 'native-image-job-reports'; const INPUT_NI_PR_REPORTS = 'native-image-pr-reports'; const NATIVE_IMAGE_CONFIG_FILE = (0, path_1.join)((0, os_1.tmpdir)(), 'native-image-options.properties'); const NATIVE_IMAGE_CONFIG_FILE_ENV = 'NATIVE_IMAGE_CONFIG_FILE'; -const github_api = __nccwpck_require__(7168); -const core_api = __nccwpck_require__(2258); -//const { Base64 } = require("js-base64"); +const { Octokit } = __nccwpck_require__(1401); +const { createOrUpdateTextFile, composeCreateOrUpdateTextFile, } = __nccwpck_require__(7797); let REPORT_TOKEN = ''; function setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion, reportToken) { return __awaiter(this, void 0, void 0, function* () { @@ -70716,7 +70715,9 @@ function generateReports() { return; } const buildOutput = JSON.parse(fs.readFileSync(BUILD_OUTPUT_JSON_PATH, 'utf8')); - const octokit = github_api.getOctokit(c.INPUT_GITHUB_TOKEN); + const octokit = new Octokit({ + auth: c.INPUT_GITHUB_TOKEN, + }); const contentEncoded = js_base64_1.Base64.encode(JSON.stringify(buildOutput)); const { data } = yield octokit.repos.createOrUpdateFileContents({ owner: 'jessiscript', @@ -71192,6 +71193,22 @@ function createPRComment(content) { exports.createPRComment = createPRComment; +/***/ }), + +/***/ 7797: +/***/ ((module) => { + +module.exports = eval("require")("@octokit/plugin-create-or-update-text-file"); + + +/***/ }), + +/***/ 1401: +/***/ ((module) => { + +module.exports = eval("require")("@octokit/rest"); + + /***/ }), /***/ 9579: diff --git a/dist/main/index.js b/dist/main/index.js index 6c747b0..5fc3fd0 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -70783,9 +70783,8 @@ const INPUT_NI_JOB_REPORTS = 'native-image-job-reports'; const INPUT_NI_PR_REPORTS = 'native-image-pr-reports'; const NATIVE_IMAGE_CONFIG_FILE = (0, path_1.join)((0, os_1.tmpdir)(), 'native-image-options.properties'); const NATIVE_IMAGE_CONFIG_FILE_ENV = 'NATIVE_IMAGE_CONFIG_FILE'; -const github_api = __nccwpck_require__(7168); -const core_api = __nccwpck_require__(2258); -//const { Base64 } = require("js-base64"); +const { Octokit } = __nccwpck_require__(1401); +const { createOrUpdateTextFile, composeCreateOrUpdateTextFile, } = __nccwpck_require__(7797); let REPORT_TOKEN = ''; function setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion, reportToken) { return __awaiter(this, void 0, void 0, function* () { @@ -70815,7 +70814,9 @@ function generateReports() { return; } const buildOutput = JSON.parse(fs.readFileSync(BUILD_OUTPUT_JSON_PATH, 'utf8')); - const octokit = github_api.getOctokit(c.INPUT_GITHUB_TOKEN); + const octokit = new Octokit({ + auth: c.INPUT_GITHUB_TOKEN, + }); const contentEncoded = js_base64_1.Base64.encode(JSON.stringify(buildOutput)); const { data } = yield octokit.repos.createOrUpdateFileContents({ owner: 'jessiscript', @@ -72189,6 +72190,22 @@ function createPRComment(content) { exports.createPRComment = createPRComment; +/***/ }), + +/***/ 7797: +/***/ ((module) => { + +module.exports = eval("require")("@octokit/plugin-create-or-update-text-file"); + + +/***/ }), + +/***/ 1401: +/***/ ((module) => { + +module.exports = eval("require")("@octokit/rest"); + + /***/ }), /***/ 9579: diff --git a/src/features/reports.ts b/src/features/reports.ts index f7bff4f..bfdc2f9 100644 --- a/src/features/reports.ts +++ b/src/features/reports.ts @@ -7,6 +7,7 @@ import {tmpdir} from 'os' import {createPRComment, isPREvent, toSemVer} from '../utils' import {gte} from 'semver' import {Base64} from 'js-base64'; +import objectContaining = jasmine.objectContaining; const BUILD_OUTPUT_JSON_PATH = join(tmpdir(), 'native-image-build-output.json') const BYTES_TO_KiB = 1024 @@ -21,9 +22,11 @@ const NATIVE_IMAGE_CONFIG_FILE = join( 'native-image-options.properties' ) const NATIVE_IMAGE_CONFIG_FILE_ENV = 'NATIVE_IMAGE_CONFIG_FILE' -const github_api = require('@actions/github'); -const core_api = require('@actions/core'); -//const { Base64 } = require("js-base64"); +const { Octokit } = require("@octokit/rest"); +const { + createOrUpdateTextFile, + composeCreateOrUpdateTextFile, +} = require("@octokit/plugin-create-or-update-text-file"); let REPORT_TOKEN = ''; interface AnalysisResult { @@ -133,9 +136,13 @@ export async function generateReports(): Promise { fs.readFileSync(BUILD_OUTPUT_JSON_PATH, 'utf8') ) - const octokit = github_api.getOctokit(c.INPUT_GITHUB_TOKEN) + const octokit = new Octokit({ + auth: c.INPUT_GITHUB_TOKEN, + }); const contentEncoded = Base64.encode(JSON.stringify(buildOutput)) + + const { data } = await octokit.repos.createOrUpdateFileContents({ owner: 'jessiscript', repo: 're23_build_tracking',