-
-
Notifications
You must be signed in to change notification settings - Fork 45
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #260 from node-oauth/development
Development
- Loading branch information
Showing
77 changed files
with
3,785 additions
and
3,298 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,6 @@ on: | |
| branches: | ||
| - release-* # all release-<version> branches | ||
|
|
||
|
|
||
| jobs: | ||
| # STEP 1 - NPM Audit | ||
|
|
||
|
|
@@ -23,13 +22,13 @@ jobs: | |
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 20 | ||
| # install to create local package-lock.json but don't cache the files | ||
| # also: no audit for dev dependencies | ||
| - run: npm i --package-lock-only && npm audit --production | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: 20 | ||
| # install to create local package-lock.json but don't cache the files | ||
| # also: no audit for dev dependencies | ||
| - run: npm i --package-lock-only && npm audit --production | ||
|
|
||
| # STEP 2 - basic unit tests | ||
|
|
||
|
|
@@ -40,34 +39,34 @@ jobs: | |
| needs: [audit] | ||
| strategy: | ||
| matrix: | ||
| node: [14, 16, 18] | ||
| node: [16, 18, 20] | ||
| steps: | ||
| - name: Checkout ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
|
|
||
| - name: Cache dependencies ${{ matrix.node }} | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.npm | ||
| key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-node-${{ matrix.node }} | ||
| # for this workflow we also require npm audit to pass | ||
| - run: npm i | ||
| - run: npm run test:coverage | ||
|
|
||
| # with the following action we enforce PRs to have a high coverage | ||
| # and ensure, changes are tested well enough so that coverage won't fail | ||
| - name: check coverage | ||
| uses: VeryGoodOpenSource/[email protected] | ||
| with: | ||
| path: './coverage/lcov.info' | ||
| min_coverage: 95 | ||
| - name: Checkout ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
|
|
||
| - name: Cache dependencies ${{ matrix.node }} | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.npm | ||
| key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-node-${{ matrix.node }} | ||
| # for this workflow we also require npm audit to pass | ||
| - run: npm i | ||
| - run: npm run test:coverage | ||
|
|
||
| # with the following action we enforce PRs to have a high coverage | ||
| # and ensure, changes are tested well enough so that coverage won't fail | ||
| - name: check coverage | ||
| uses: VeryGoodOpenSource/[email protected] | ||
| with: | ||
| path: './coverage/lcov.info' | ||
| min_coverage: 95 | ||
|
|
||
| # STEP 3 - Integration tests | ||
|
|
||
|
|
@@ -80,41 +79,41 @@ jobs: | |
| needs: [unittest] | ||
| strategy: | ||
| matrix: | ||
| node: [14, 16, 18] # TODO get running for node 16+ | ||
| node: [16, 18, 20] # TODO get running for node 16+ | ||
| steps: | ||
| # checkout this repo | ||
| - name: Checkout ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
|
|
||
| # checkout express-adapter repo | ||
| - name: Checkout express-adapter ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: node-oauth/express-oauth-server | ||
| path: github/testing/express | ||
|
|
||
| - name: Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
|
|
||
| - name: Cache dependencies ${{ matrix.node }} | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.npm | ||
| key: ${{ runner.os }}-node-${{ matrix.node }}-node-oauth/express-oauth-server-${{ hashFiles('github/testing/express/**/package-lock.json') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-node-${{ matrix.node }}-node-oauth/express-oauth-server | ||
| # in order to test the adapter we need to use the current checkout | ||
| # and install it as local dependency | ||
| # we just cloned and install it as local dependency | ||
| # xxx: added bluebird as explicit dependency | ||
| - run: | | ||
| cd github/testing/express | ||
| npm i | ||
| npm install ../../../ | ||
| npm run test | ||
| # checkout this repo | ||
| - name: Checkout ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
|
|
||
| # checkout express-adapter repo | ||
| - name: Checkout express-adapter ${{ matrix.node }} | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| repository: node-oauth/express-oauth-server | ||
| path: github/testing/express | ||
|
|
||
| - name: Setup node ${{ matrix.node }} | ||
| uses: actions/setup-node@v3 | ||
| with: | ||
| node-version: ${{ matrix.node }} | ||
|
|
||
| - name: Cache dependencies ${{ matrix.node }} | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.npm | ||
| key: ${{ runner.os }}-node-${{ matrix.node }}-node-oauth/express-oauth-server-${{ hashFiles('github/testing/express/**/package-lock.json') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-node-${{ matrix.node }}-node-oauth/express-oauth-server | ||
| # in order to test the adapter we need to use the current checkout | ||
| # and install it as local dependency | ||
| # we just cloned and install it as local dependency | ||
| # xxx: added bluebird as explicit dependency | ||
| - run: | | ||
| cd github/testing/express | ||
| npm i | ||
| npm install https://github.com/node-oauth/node-oauth2-server.git#${{ github.ref_name }} | ||
| npm run test | ||
| # todo repeat with other adapters | ||
|
|
||
|
|
@@ -139,13 +138,13 @@ jobs: | |
| contents: read | ||
| packages: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| # we always publish targeting the lowest supported node version | ||
| node-version: 16 | ||
| registry-url: $registry-url(npm) | ||
| - run: npm i | ||
| - run: npm publish --dry-run | ||
| env: | ||
| NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-node@v3 | ||
| with: | ||
| # we always publish targeting the lowest supported node version | ||
| node-version: 16 | ||
| registry-url: $registry-url(npm) | ||
| - run: npm i | ||
| - run: npm publish --dry-run | ||
| env: | ||
| NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| recursive: true | ||
| reporter: "spec" | ||
| retries: 1 | ||
| retries: 0 | ||
| slow: 20 | ||
| timeout: 2000 | ||
| ui: "bdd" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.