From eab4a196642866e009e53691c9b076dae309bd63 Mon Sep 17 00:00:00 2001 From: Eric Black Date: Tue, 7 May 2024 16:26:02 -0700 Subject: [PATCH 1/6] Update checkout/setup to v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0dc4e9d..c01ce44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,9 @@ jobs: os: [windows-latest, ubuntu-latest, macos-latest] node-version: [lts/gallium, lts/fermium] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Use Node.js LTS versions (v10-v16) - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} cache: yarn From 4280244d7fb364e9fd95f30cb8ddda49961c7af8 Mon Sep 17 00:00:00 2001 From: Eric Black Date: Tue, 7 May 2024 16:29:09 -0700 Subject: [PATCH 2/6] Update name for 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 c01ce44..ab225e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: node-version: [lts/gallium, lts/fermium] steps: - uses: actions/checkout@v4 - - name: Use Node.js LTS versions (v10-v16) + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} From 51b2d37c21625fa320f33f6b74be7329406b454a Mon Sep 17 00:00:00 2001 From: Eric Black Date: Tue, 7 May 2024 16:33:58 -0700 Subject: [PATCH 3/6] Use x64 architecture for now --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab225e2..5d6a972 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: yarn + architecture: x64 - run: yarn --frozen-lockfile --network-timeout 1000000 env: CI: true From d66a0564c9197a825e82761d10c797dd971b709a Mon Sep 17 00:00:00 2001 From: Eric Black Date: Tue, 7 May 2024 16:47:57 -0700 Subject: [PATCH 4/6] Add tool-versions and mocha options to apply lengthier timeout --- .tool-versions | 1 + package.json | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..5f732e6 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 16.19.0 \ No newline at end of file diff --git a/package.json b/package.json index 2bfef49..b5ba610 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,17 @@ "license": "ISC", "main": "lib/index.js", "repository": "heroku/heroku-cli-command", + "mocha": { + "require": [ + "test/helpers/init.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-extensions": "ts", + "recursive": true, + "reporter": "spec", + "timeout": 360000 + }, "scripts": { "build": "rm -rf lib && tsc", "lint": "tsc -p test --noEmit && tslint -p test -t stylish", From 264cb69c20a672acfe0cfdc7efe95a1ff36aa13c Mon Sep 17 00:00:00 2001 From: Eric Black Date: Wed, 8 May 2024 09:15:27 -0700 Subject: [PATCH 5/6] Fix whitespace --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 5f732e6..d82b78e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -nodejs 16.19.0 \ No newline at end of file +nodejs 16.19.0 From 159e00ae0be58904712528a071555702935d95e5 Mon Sep 17 00:00:00 2001 From: Eric Black Date: Wed, 8 May 2024 09:35:26 -0700 Subject: [PATCH 6/6] More recent version of node, remove old mocha options file --- .tool-versions | 2 +- test/mocha.opts | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 test/mocha.opts diff --git a/.tool-versions b/.tool-versions index d82b78e..ae96860 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -nodejs 16.19.0 +nodejs 16.20.2 diff --git a/test/mocha.opts b/test/mocha.opts deleted file mode 100644 index ccc7f34..0000000 --- a/test/mocha.opts +++ /dev/null @@ -1,7 +0,0 @@ ---require test/helpers/init.js ---require ts-node/register ---require source-map-support/register ---watch-extensions ts ---recursive ---reporter spec ---timeout 5000