From 4b0ff9fcb0fc9d98f02c9d1650bf7f1d25ce5586 Mon Sep 17 00:00:00 2001 From: Maxim Hayes Date: Wed, 31 Jan 2024 14:29:03 -0500 Subject: [PATCH] test --- .github/CODEOWNERS | 1 - .github/workflows/node.js.yml | 185 ++++++++++++++++++---------------- package.json | 3 +- 3 files changed, 101 insertions(+), 88 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 427ef5acee1..8befa09ffa1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,5 +1,4 @@ * @aws/aws-ides-team packages/toolkit/src/codewhisperer/ @aws/codewhisperer-team -packages/toolkit/src/amazonqFeatureDev/ @aws/earlybird packages/toolkit/src/codewhispererChat/ @aws/aws-mynah packages/toolkit/src/amazonq/ @aws/aws-mynah diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 1dbf2edc2f3..2a83f4d3cba 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -13,92 +13,105 @@ jobs: macos: name: test macOS runs-on: macos-latest - strategy: - fail-fast: false - matrix: - node-version: [16.x] - vscode-version: [minimum, stable, insiders] - env: - VSCODE_TEST_VERSION: ${{ matrix.vscode-version }} - NODE_OPTIONS: '--max-old-space-size=8192' + # strategy: + # fail-fast: false + # matrix: + # node-version: [16.x] + # vscode-version: [minimum, stable, insiders] + # env: + # VSCODE_TEST_VERSION: ${{ matrix.vscode-version }} + # NODE_OPTIONS: '--max-old-space-size=8192' steps: - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - name: Tests - uses: coactions/setup-xvfb@v1 - with: - run: npm test - - name: Code coverage - env: - # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 - NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} - uses: codecov/codecov-action@v3 - with: - verbose: true - file: ./coverage/lcov.info - flags: macos-unittests - - name: Code coverage (CodeWhisperer) - env: - # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 - NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} - uses: codecov/codecov-action@v3 - with: - verbose: true - file: ./coverage/lcov.info - flags: codewhisperer + - run: echo 0 + # macos: + # name: test macOS + # runs-on: macos-latest + # strategy: + # fail-fast: false + # matrix: + # node-version: [16.x] + # vscode-version: [minimum, stable, insiders] + # env: + # VSCODE_TEST_VERSION: ${{ matrix.vscode-version }} + # NODE_OPTIONS: '--max-old-space-size=8192' + # steps: + # - uses: actions/checkout@v4 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v4 + # with: + # node-version: ${{ matrix.node-version }} + # - run: npm ci + # - name: Tests + # uses: coactions/setup-xvfb@v1 + # with: + # run: npm test + # - name: Code coverage + # env: + # # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 + # NODE_OPTIONS: '' + # if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} + # uses: codecov/codecov-action@v3 + # with: + # verbose: true + # file: ./coverage/lcov.info + # flags: macos-unittests + # - name: Code coverage (CodeWhisperer) + # env: + # # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 + # NODE_OPTIONS: '' + # if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} + # uses: codecov/codecov-action@v3 + # with: + # verbose: true + # file: ./coverage/lcov.info + # flags: codewhisperer - windows: - name: test Windows - runs-on: windows-2019 - strategy: - fail-fast: false - matrix: - node-version: [16.x] - vscode-version: [stable, insiders] - env: - VSCODE_TEST_VERSION: ${{ matrix.vscode-version }} - NODE_OPTIONS: '--max-old-space-size=8192' - steps: - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - name: Tests - run: npm test - - name: Code coverage - env: - # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 - NODE_OPTIONS: '' - if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} - uses: codecov/codecov-action@v3 - with: - verbose: true - file: ./coverage/lcov.info - flags: windows-unittests + # windows: + # name: test Windows + # runs-on: windows-2019 + # strategy: + # fail-fast: false + # matrix: + # node-version: [16.x] + # vscode-version: [stable, insiders] + # env: + # VSCODE_TEST_VERSION: ${{ matrix.vscode-version }} + # NODE_OPTIONS: '--max-old-space-size=8192' + # steps: + # - uses: actions/checkout@v4 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v4 + # with: + # node-version: ${{ matrix.node-version }} + # - run: npm ci + # - name: Tests + # run: npm test + # - name: Code coverage + # env: + # # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475 + # NODE_OPTIONS: '' + # if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }} + # uses: codecov/codecov-action@v3 + # with: + # verbose: true + # file: ./coverage/lcov.info + # flags: windows-unittests - lint: - name: Lint - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [16.x] - vscode-version: [stable] - env: - NODE_OPTIONS: '--max-old-space-size=8192' - steps: - - uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run testCompile - - run: npm run lint + # lint: + # name: Lint + # runs-on: ubuntu-latest + # strategy: + # matrix: + # node-version: [16.x] + # vscode-version: [stable] + # env: + # NODE_OPTIONS: '--max-old-space-size=8192' + # steps: + # - uses: actions/checkout@v4 + # - name: Use Node.js ${{ matrix.node-version }} + # uses: actions/setup-node@v4 + # with: + # node-version: ${{ matrix.node-version }} + # - run: npm ci + # - run: npm run testCompile + # - run: npm run lint diff --git a/package.json b/package.json index 209f65a1ad3..0ddad6a8643 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "lint": "npm run lint -w packages/ && npm run format", "lintfix": "eslint -c .eslintrc.js --fix --ext .ts packages plugins && npm run formatfix", "clean": "npm run clean -w packages/ -w plugins/", - "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules packages/toolkit/node_modules && npm install" + "reset": "npm run clean && ts-node ./scripts/clean.ts node_modules packages/toolkit/node_modules && npm install", + "generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/" }, "devDependencies": { "eslint": "^8.26.0",