From bc98655a133ef98b04160cd442d1bc3472d95194 Mon Sep 17 00:00:00 2001 From: Sam Gammon Date: Thu, 30 Nov 2023 22:50:21 -0800 Subject: [PATCH] chore: cleanups and lint fixes Signed-off-by: Sam Gammon --- .eslintignore | 2 ++ .github/linters/.eslintrc.yml | 2 +- package.json | 3 ++- src/agent.ts | 3 +-- src/main.ts | 3 ++- src/releases.ts | 2 +- src/transport.ts | 12 +++++++----- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.eslintignore b/.eslintignore index 193716c..0d288ba 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,5 @@ node_modules/ coverage/ __tests__/ .dev/ +src/gen/ + diff --git a/.github/linters/.eslintrc.yml b/.github/linters/.eslintrc.yml index daa5c04..d2cd1ae 100644 --- a/.github/linters/.eslintrc.yml +++ b/.github/linters/.eslintrc.yml @@ -57,7 +57,7 @@ rules: '@typescript-eslint/func-call-spacing': ['error', 'never'], '@typescript-eslint/no-array-constructor': 'error', '@typescript-eslint/no-empty-interface': 'error', - '@typescript-eslint/no-explicit-any': 'error', + '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-extraneous-class': 'error', '@typescript-eslint/no-for-in-array': 'error', '@typescript-eslint/no-inferrable-types': 'error', diff --git a/package.json b/package.json index ac24ab6..199ce4b 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,12 @@ "build": "pnpm run bundle", "bundle": "pnpm run format:write && pnpm run package", "ci-test": "jest", + "gen": "buf generate --include-imports", "coverage": "make-coverage-badge --output-path ./badges/coverage.svg", "format:write": "prettier --write **/*.ts", "format:check": "prettier --check **/*.ts", "lint": "npx eslint . -c ./.github/linters/.eslintrc.yml", - "package": "pnpm run package:main && pnpm run package:cleanup", + "package": "pnpm run gen && pnpm run package:main && pnpm run package:cleanup", "package:main": "ncc build src/index.ts --license licenses.txt", "package:cleanup": "ncc build src/cleanup.ts -o dist/cleanup", "package:watch": "pnpm run package -- --watch", diff --git a/src/agent.ts b/src/agent.ts index 4fe21c1..095ff9f 100644 --- a/src/agent.ts +++ b/src/agent.ts @@ -1,5 +1,3 @@ -import * as core from '@actions/core' -import path from 'path' import fs from 'fs' import { OS } from './config' import { agentStart, agentStop, agentStatus, agentInstall } from './command' @@ -60,6 +58,7 @@ async function resolveAgentConfig(os: OS): Promise { */ export async function agentConfig(os: OS): Promise { if (activeAgent === null && !queriedForAgent) { + queriedForAgent = true activeAgent = await resolveAgentConfig(os) } return activeAgent diff --git a/src/main.ts b/src/main.ts index 92e8d5c..b1c0dd4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -213,7 +213,8 @@ export async function install(options?: Partial): Promise { * @returns {Promise} Resolves when the action is complete. */ export async function postExecute(options?: Partial): Promise { - core.info('Cleaning up Buildless Agent and resources...') + const opts = JSON.stringify(options || {}) + core.info(`Cleaning up Buildless Agent and resources... (options: ${opts})`) } /** diff --git a/src/releases.ts b/src/releases.ts index b2692ce..e1b940b 100644 --- a/src/releases.ts +++ b/src/releases.ts @@ -3,7 +3,7 @@ import { Octokit } from 'octokit' import * as toolCache from '@actions/tool-cache' import * as github from '@actions/github' import type { BuildlessSetupActionOptions as Options } from './options' -import { GITHUB_DEFAULT_HEADERS, OS, Arch } from './config' +import { GITHUB_DEFAULT_HEADERS, OS } from './config' import { obtainVersion } from './command' const downloadBase = 'https://dl.less.build' diff --git a/src/transport.ts b/src/transport.ts index fff90bc..746eacb 100644 --- a/src/transport.ts +++ b/src/transport.ts @@ -1,10 +1,12 @@ -import { Transport, createPromiseClient } from '@connectrpc/connect' -import { createConnectTransport } from '@connectrpc/connect-node' -import { createGrpcTransport } from '@connectrpc/connect-node' +import { Transport } from '@connectrpc/connect' +import { + createConnectTransport, + createGrpcTransport +} from '@connectrpc/connect-node' import { Empty } from '@bufbuild/protobuf' -import { ClientConfig } from '@api/buildless/service/v1/buildless-v1_connect' -import { AuthorizeRequest } from '@api/buildless/service/v1/buildless-v1_pb' +import { ClientConfig } from './gen/buildless/service/v1/buildless-v1_connect' +import { AuthorizeRequest } from './gen/buildless/service/v1/buildless-v1_pb' import { RpcTransport,