Skip to content

Commit 1759ba7

Browse files
authored
Revert "CI: fix update-integration-meta script (#1432)" (#1435)
This reverts commit 5ced7a8.
1 parent 5ced7a8 commit 1759ba7

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- name: Clone devextreme repo from PR author fork
2020
continue-on-error: true
2121
if: github.event_name == 'pull_request'
22-
run: git clone -b ${{github.event.pull_request.head.ref}} https://github.com/${{github.event.pull_request.user.login}}/devextreme ../devextreme_monorepo
22+
run: git clone -b ${{github.event.pull_request.head.ref}} https://github.com/${{github.event.pull_request.user.login}}/devextreme ../devextreme
2323

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

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

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

4848
- name: Build devextreme repo
49-
working-directory: ../devextreme_monorepo/packages/devextreme
49+
working-directory: ../devextreme/packages/devextreme
5050
run: npm run build-npm-devextreme
5151

52-
- name: Move devextreme from packages
53-
run: mv ../devextreme_monorepo/packages/devextreme ../devextreme
54-
55-
- name: Install packages in devextreme package
56-
working-directory: ../devextreme
57-
run: npm i --no-audit --no-fund
58-
5952
- name: Discover declarations
60-
working-directory: ../devextreme
53+
working-directory: ../devextreme/packages/devextreme
6154
run: npm run discover-declarations
6255

6356
- name: Install devextreme package
6457
continue-on-error: true
65-
run: npm i --save-dev ../devextreme/artifacts/npm/devextreme --workspace=devextreme-angular --workspace=devextreme-angular-sandbox
58+
run: npm i --save-dev ../devextreme/packages/devextreme/artifacts/npm/devextreme --workspace=devextreme-angular --workspace=devextreme-angular-sandbox
6659

6760
- name: Run npm install
6861
run: npm i --no-audit --no-fund

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"test:dev": "npm run test:dev --ws --if-present",
1717
"pack": "npm run update-integration-meta && npm run pack --ws --if-present",
1818
"lint": "gulp lint",
19-
"update-integration-meta": "dx-tools generate-ng-smd --artifacts ../devextreme/artifacts/internal-tools --output-path ./packages/devextreme-angular/metadata/NGMetaData.json"
19+
"update-integration-meta": "dx-tools generate-ng-smd --artifacts ../devextreme/packages/devextreme/artifacts/internal-tools --output-path ./packages/devextreme-angular/metadata/NGMetaData.json"
2020
},
2121
"author": "Developer Express Inc.",
2222
"license": "MIT",

0 commit comments

Comments
 (0)