diff --git a/.github/workflows/actions-dev-kit-ci.yml b/.github/workflows/actions-dev-kit-ci.yml index 1d6f591e8..b98f7d319 100644 --- a/.github/workflows/actions-dev-kit-ci.yml +++ b/.github/workflows/actions-dev-kit-ci.yml @@ -26,8 +26,8 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 16 - - run: npm install --global lerna yarn #install dependencies - - run: lerna bootstrap #prepare packages to be built + - run: npm install --global lerna yarn #install global dependencies + - run: yarn install #install and link depdendencies - run: ./build.sh #build - run: yarn run api-ref #test generate /docs - run: yarn run api-ref-pre-release #test generate /pre-release-docs diff --git a/.github/workflows/actions-dev-kit-deploy-docs.yml b/.github/workflows/actions-dev-kit-deploy-docs.yml index 45d491988..d400e1dc2 100644 --- a/.github/workflows/actions-dev-kit-deploy-docs.yml +++ b/.github/workflows/actions-dev-kit-deploy-docs.yml @@ -49,7 +49,7 @@ jobs: - run: yarn --version - run: npm --version - - run: lerna bootstrap # Runs `yarn install` and prepare all the packages in this monorepo for the build + - run: yarn install # install dependencies - run: yarn run all #build - run: yarn run api-ref #generate /docs # Commit /docs folder back to the main branch. GitHub then deploys it automatically to GitHub pages diff --git a/.github/workflows/actions-dev-kit-release-prod.yml b/.github/workflows/actions-dev-kit-release-prod.yml index 41c9826a9..56f247e17 100644 --- a/.github/workflows/actions-dev-kit-release-prod.yml +++ b/.github/workflows/actions-dev-kit-release-prod.yml @@ -62,7 +62,7 @@ jobs: - run: npm --version # Runs `yarn install` and prepare all the packages in this monorepo for the build - - run: lerna bootstrap + - run: yarn install # Builds and tests all the packages - run: yarn run all # Upgrades major|minor|patch version for all the packages even if there's no changes in some or all of them. @@ -73,4 +73,4 @@ jobs: # Publishes ADK packages to CodeArtifact - run: lerna publish from-package --yes env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/build.sh b/build.sh index 45517d55f..af2c34e12 100755 --- a/build.sh +++ b/build.sh @@ -1,2 +1,2 @@ -lerna bootstrap +yarn install yarn run all diff --git a/lerna.json b/lerna.json index 198720440..de9f2a22f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,6 @@ { "lerna": "3.15.0", "npmClient": "yarn", - "useWorkspaces": true, "packages": [ "packages/*", "packages/codecatalyst-entities/*"