From 1759ba73c355ffca03b81f26ca46a280d2876600 Mon Sep 17 00:00:00 2001 From: Alex Lavrov <36633600+alexslavr@users.noreply.github.com> Date: Mon, 31 Jul 2023 15:45:46 +0400 Subject: [PATCH] Revert "CI: fix update-integration-meta script (#1432)" (#1435) This reverts commit 5ced7a8ff39f8d1969cac7574e837950e8493f90. --- .github/workflows/tests.yml | 21 +++++++-------------- package.json | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0daff35a5..638d1b70a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 @@ -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 diff --git a/package.json b/package.json index 2e2d3b399..1d373dc14 100644 --- a/package.json +++ b/package.json @@ -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",