Skip to content

Commit

Permalink
Revert "CI: fix update-integration-meta script (#1432)" (#1435)
Browse files Browse the repository at this point in the history
This reverts commit 5ced7a8.
  • Loading branch information
alexslavr authored Jul 31, 2023
1 parent 5ced7a8 commit 1759ba7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
21 changes: 7 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
- name: Clone devextreme repo from PR author fork
continue-on-error: true
if: github.event_name == 'pull_request'
run: git clone -b ${{github.event.pull_request.head.ref}} https://github.com/${{github.event.pull_request.user.login}}/devextreme ../devextreme_monorepo
run: git clone -b ${{github.event.pull_request.head.ref}} https://github.com/${{github.event.pull_request.user.login}}/devextreme ../devextreme

- name: Clone devextreme repo
run: test -d ../devextreme_monorepo || git clone -b 23_2 https://github.com/devexpress/devextreme ../devextreme_monorepo
run: test -d ../devextreme || git clone -b 23_2 https://github.com/devexpress/devextreme ../devextreme

- name: Use Node.js 18
uses: actions/setup-node@v3
Expand All @@ -41,28 +41,21 @@ jobs:
key: ${{ runner.os }}-node-modules-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-modules

- name: Install packages in devextreme monorepo
working-directory: ../devextreme_monorepo
- name: Install packages in devextreme repo
working-directory: ../devextreme
run: npm i --no-audit --no-fund

- name: Build devextreme repo
working-directory: ../devextreme_monorepo/packages/devextreme
working-directory: ../devextreme/packages/devextreme
run: npm run build-npm-devextreme

- name: Move devextreme from packages
run: mv ../devextreme_monorepo/packages/devextreme ../devextreme

- name: Install packages in devextreme package
working-directory: ../devextreme
run: npm i --no-audit --no-fund

- name: Discover declarations
working-directory: ../devextreme
working-directory: ../devextreme/packages/devextreme
run: npm run discover-declarations

- name: Install devextreme package
continue-on-error: true
run: npm i --save-dev ../devextreme/artifacts/npm/devextreme --workspace=devextreme-angular --workspace=devextreme-angular-sandbox
run: npm i --save-dev ../devextreme/packages/devextreme/artifacts/npm/devextreme --workspace=devextreme-angular --workspace=devextreme-angular-sandbox

- name: Run npm install
run: npm i --no-audit --no-fund
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test:dev": "npm run test:dev --ws --if-present",
"pack": "npm run update-integration-meta && npm run pack --ws --if-present",
"lint": "gulp lint",
"update-integration-meta": "dx-tools generate-ng-smd --artifacts ../devextreme/artifacts/internal-tools --output-path ./packages/devextreme-angular/metadata/NGMetaData.json"
"update-integration-meta": "dx-tools generate-ng-smd --artifacts ../devextreme/packages/devextreme/artifacts/internal-tools --output-path ./packages/devextreme-angular/metadata/NGMetaData.json"
},
"author": "Developer Express Inc.",
"license": "MIT",
Expand Down

0 comments on commit 1759ba7

Please sign in to comment.