Skip to content

Commit

Permalink
Merge pull request #1828 from zowe/update-attept-two
Browse files Browse the repository at this point in the history
Update to support Node 20 attempt two
  • Loading branch information
zFernand0 authored Oct 18, 2023
2 parents 4e76260 + 8f5a86c commit a82623f
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/secrets-sdk-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
check-latest: true
cache: npm
- name: Install dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/secrets-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- host: windows-latest
target: aarch64-pc-windows-msvc
build: npm run build -- --target aarch64-pc-windows-msvc
name: stable - ${{ matrix.settings.target }} - node@16
name: stable - ${{ matrix.settings.target }} - node@18
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -224,8 +224,8 @@ jobs:
target: armv7-unknown-linux-gnueabihf
platform: linux/arm/v7
node:
- "16"
- "18"
- "20"
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/zowe-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]
os: [windows-latest, ubuntu-latest, macos-latest]

env:
Expand Down Expand Up @@ -182,11 +182,10 @@ jobs:
persist-credentials: false
ref: ${{ github.ref }}

# Use Node 16 until npm@9 bundled with Node 18 becomes more stable
- name: Use Node.js 16
- name: Use Node.js 18
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: '18'

- name: Install Dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ typings/
/config/
**/docs/typedoc/
__tests__/__results__/
packages/zosunix/__tests__/__results__/
packages/**/__tests__/__results__/
/__tests__/tmpproj/
/__tests__/src/locales
/.nyc_output
Expand Down
4 changes: 2 additions & 2 deletions packages/core/__tests__/utils/__unit__/CoreUtils.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ describe("CoreUtils", () => {
it("should sleep the default amount", async () => {
const defaultSleepTime = 1000;

jest.useFakeTimers();
jest.useFakeTimers({legacyFakeTimers: true});
jest.spyOn(global, "setTimeout");

const waitForSleep = CoreUtils.sleep();
Expand All @@ -324,7 +324,7 @@ describe("CoreUtils", () => {
it("should sleep for the specified amount", async () => {
const specifiedTime = 5000;

jest.useFakeTimers();
jest.useFakeTimers({legacyFakeTimers: true});
jest.spyOn(global, "setTimeout");

const waitForSleep = CoreUtils.sleep(specifiedTime);
Expand Down

0 comments on commit a82623f

Please sign in to comment.