Skip to content

Commit 7832e91

Browse files
authored
Merge branch 'main' into disable-playwright-no-await-in-loop
2 parents af96f18 + 3187bb3 commit 7832e91

File tree

32 files changed

+5807
-7371
lines changed

32 files changed

+5807
-7371
lines changed

.github/CODEOWNERS

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2023 National Instruments
2+
3+
# Each line is a file pattern followed by one or more owners.
4+
# More info: https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners
5+
6+
# These owners will be the default owners for everything in the repo.
7+
* @jattasNI @mure @rajsite @TrevorKarjanis

.github/workflows/build.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,34 @@ on:
77
env:
88
GITHUB_SERVICE_USER: "rajsite"
99
GITHUB_SERVICE_EMAIL: "[email protected]"
10+
HAS_GITHUBPAGESDEPLOYTOKEN: ${{secrets.GITHUBPAGESDEPLOYTOKEN != ''}}
11+
HAS_NPM_TOKEN: ${{secrets.NPM_TOKEN != ''}}
1012

1113
jobs:
1214
build:
1315
runs-on: ubuntu-22.04
1416
steps:
15-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
18+
if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'true'
1619
with:
17-
# Required for beachball changelog detection
18-
fetch-depth: 0
1920
# Must checkout with a token that can push to protected branches for beachball
2021
# Cannot rely on GITHUB_TOKEN with workflow contents permission
2122
# See: https://github.com/orgs/community/discussions/40971
2223
token: ${{ secrets.GITHUBPAGESDEPLOYTOKEN }}
24+
- uses: actions/checkout@v4
25+
if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'false'
2326

2427
# Install dependencies
25-
- uses: actions/setup-node@v3
28+
- uses: actions/setup-node@v4
2629
with:
27-
node-version: '16'
30+
node-version: '20'
2831
registry-url: 'https://registry.npmjs.org'
2932
cache: 'npm'
3033
- run: npm ci
3134

3235
# Build
3336
- run: npm run pack
34-
- uses: actions/upload-artifact@v3
37+
- uses: actions/upload-artifact@v4
3538
with:
3639
name: packages
3740
path: packages/**/*.tgz
@@ -51,11 +54,11 @@ jobs:
5154

5255
# Publish updates
5356
- name: Set Git User
54-
if: github.repository_owner == 'ni' && startsWith(github.ref, 'refs/heads/main')
57+
if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'true' && startsWith(github.ref, 'refs/heads/main')
5558
run: |
5659
git config --global user.name "${{ env.GITHUB_SERVICE_USER }}"
5760
git config --global user.email "${{ env.GITHUB_SERVICE_EMAIL }}"
58-
- if: github.repository_owner == 'ni' && startsWith(github.ref, 'refs/heads/main')
61+
- if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'true' && env.HAS_NPM_TOKEN == 'true' && startsWith(github.ref, 'refs/heads/main')
5962
env:
6063
NPM_SECRET_TOKEN: ${{ secrets.NPM_TOKEN }}
6164
run: npm run publish:ci -- -n $NPM_SECRET_TOKEN

CONTRIBUTING.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ The goal of the smoke tests is basic validation that the eslint configurations c
3939

4040
### Creating a pull request
4141

42-
Currently the repository only supports contributions by creating a branch and pull request (we hope to support a fork-pull workflow soon). Not all users can create a branch in this repo; contact @rajsite to be granted the necessary privileges.
42+
1. Create a fork of the repository.
43+
2. (optional, but recommended) On the Actions tab of your repository enable actions for the repo. This allows the tests to run in the branches of your fork.
44+
3. Create and edit a branch in your fork.
45+
4. Open a pull request to Nimble for the branch.
46+
- (optional, but recommended) While creating the pull request enable the "Allow edits and access to secrets by maintainers" option. This will allow maintainers to push small changes to the branch to resolve needed changes quicker.
47+
5. Create a beachball change file for your project by doing one of the following:
48+
1. Follow the [Beachball change file](#beachball-change-file) instructions below to create a change file and push to your branch.
49+
2. If you allowed maintainers to edit your branch, they may add a change file for you or request that you add one.
50+
6. Maintainers will review the PR, may request updates, and eventually merge and release the changes.
4351

4452
### Beachball change file
4553

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -326,11 +326,11 @@ This option can be adapted for npm scripts, for example.
326326

327327
If there are situations where the analysis time for enabling the type checked rules is an excessive burden you may consider creating a separate ESLint configuration that avoids extending the type checked rules and omits the `parserOptions.project` configuration to run in specific scenarios.
328328

329-
See discussion in the [performance section](https://github.com/typescript-eslint/typescript-eslint/blob/master/docs/getting-started/linting/TYPED_LINTING.md#performance) of the Getting Started - Linting with Type Information guide.
329+
See discussion in the [performance section](https://github.com/typescript-eslint/typescript-eslint/blob/main/docs/getting-started/linting/TYPED_LINTING.md#performance) of the Getting Started - Linting with Type Information guide.
330330

331331
### Angular linting performance
332332

333-
Deviations from the `@angular-eslint schematic`, `@ni/eslint-config-angular`, and the [`parserOptions.project`](https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser#parseroptionsproject) configurations can result in significant performance degredation. Fully manual configuration [is not recommended](https://github.com/angular-eslint/angular-eslint#going-fully-manual-not-recommended). Read `@angular-eslint`'s [section on performance](https://github.com/angular-eslint/angular-eslint#eslint-configs-and-performance) for information on addressing slow linting processes.
333+
Deviations from the `@angular-eslint schematic`, `@ni/eslint-config-angular`, and the [`parserOptions.project`](https://github.com/typescript-eslint/typescript-eslint/tree/main/packages/parser#parseroptionsproject) configurations can result in significant performance degredation. Fully manual configuration [is not recommended](https://github.com/angular-eslint/angular-eslint#going-fully-manual-not-recommended). Read `@angular-eslint`'s [section on performance](https://github.com/angular-eslint/angular-eslint#eslint-configs-and-performance) for information on addressing slow linting processes.
334334
335335
## License
336336

0 commit comments

Comments
 (0)