From 901ee92fe97606bd27840900512b0fa760ba428e Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Sun, 20 Mar 2022 22:02:36 -0400 Subject: [PATCH 1/3] prettier ci --- .github/workflows/ci.yml | 24 +++++++++++++++++++----- package.json | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff53a560b..bcda3921a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the dev branch push: - branches: [ dev ] + branches: [dev] pull_request: - branches: [ dev ] + branches: [dev] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -20,7 +20,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: 16.13.1 - cache: 'npm' + cache: "npm" - name: Install npm dependencies run: npm ci - name: Build the production app @@ -34,11 +34,25 @@ jobs: uses: actions/setup-node@v2 with: node-version: 16.13.1 - cache: 'npm' + cache: "npm" - name: Install npm dependencies run: npm ci - name: Run linter run: npm run lint:report + prettier: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Use Node.js 16.13.1 + uses: actions/setup-node@v2 + with: + node-version: 16.13.1 + cache: "npm" + - name: Install npm dependencies + run: npm ci + - name: Run prettier check + run: npm run format:report test: name: Test runs-on: ubuntu-latest @@ -48,7 +62,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: 16.13.1 - cache: 'npm' + cache: "npm" - name: Install npm dependencies run: npm ci - name: Run tests diff --git a/package.json b/package.json index 8457d6f38..a429ee418 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,7 @@ "cy:run": "cypress run", "doc": "npx api-extractor run && npx api-documenter markdown && rm input/bitburner.api.json && rm -r input", "format": "prettier --write .", + "format:report": "prettier -c .", "start": "http-server -p 8000", "start:dev": "webpack-dev-server --progress --env.devServer --mode development", "start:dev-fast": "webpack-dev-server --progress --env.devServer --mode development --fast true", From fb93d9749330c8e0a432120ca7a7732b47b2ca4d Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Sun, 20 Mar 2022 22:03:11 -0400 Subject: [PATCH 2/3] change name of ci step --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcda3921a..c714b6b14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - name: Run linter run: npm run lint:report prettier: - name: Lint + name: Prettier runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 00d1d294ed90e002a9c7a185b98890b87fa35f7b Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Sun, 20 Mar 2022 22:14:32 -0400 Subject: [PATCH 3/3] fix lint errors --- src/ScriptEditor/NetscriptDefinitions.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index d564639ef..dec9cdf33 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -6667,7 +6667,7 @@ export interface Corporation extends WarehouseAPI, OfficeAPI { sellShares(amount: number): void; /** * Get bonus time. - * + * * “Bonus time” is accumulated when the game is offline or if the game is inactive in the browser. * * “Bonus time” makes the game progress faster. @@ -6675,7 +6675,7 @@ export interface Corporation extends WarehouseAPI, OfficeAPI { * @returns Bonus time for the Corporation mechanic in milliseconds. */ getBonusTime(): number; - + } /**