Skip to content

Commit

Permalink
ci: consume org workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
joergmann committed Jan 23, 2025
1 parent 2210d02 commit 56db85a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 26 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,14 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.version }}

- run: |
npm i -g npm
npm ci
npm install file:. --no-save --force
npm run prerelease:ci-fix
npm run rollup:off
- name: Run integration test with non-admin user on windows
if: matrix.os == 'windows-latest'
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,5 @@ on:

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Run Linter
run: |
npm ci
npm run lint
uses: cap-js/.github/.github/workflows/lint.yml@main
secrets: inherit
3 changes: 0 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ jobs:
- name: Run Unit Tests
run: |
npm ci
npm install file:. --no-save --force
npm run prerelease:ci-fix
npm run rollup && npm run rollup:on
npm run test
- name: get-version
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,12 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.version }}

- name: Run Unit Tests
run: |
npm ci
npm install file:. --no-save --force
npm run prerelease:ci-fix
npm run rollup:off
npm run test
npm run rollup && npm run rollup:on
npm run test
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
"README.md"
],
"scripts": {
"test": "jest --silent",
"test:integration": "jest --testMatch \"**/test/**/*.integrationtest.js\"",
"test:rollup": "npm run rollup; npm run rollup:on; npm run test; npm run rollup:off",
"test:common": "npm install file:. --no-save --force && npm run prerelease:ci-fix",
"test": "npm run test:common && npm run test:rollup-off && npm run test:rollup-on",
"test:rollup-on": "npm run rollup && npm run rollup:on && jest --silent",
"test:rollup-off": "npm run rollup:off && jest --silent",
"test:integration": "npm run test:common && npm run rollup:off && jest --testMatch \"**/test/**/*.integrationtest.js\"",
"rollup": "rm -rf dist/ && mkdir -p etc/ && npx -y @microsoft/api-extractor run --local --verbose && .github/rollup-patch.js",
"rollup:on": "npm pkg set typings=dist/cds-types.d.ts && [ -d 'apis' ] && mv -- apis -apis || true",
"rollup:off": "npm pkg set typings=apis/cds.d.ts && [ -d '-apis' ] && mv -- -apis apis || true",
Expand Down

0 comments on commit 56db85a

Please sign in to comment.