Skip to content

Commit

Permalink
switch to workspaces
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoloboschi committed Apr 10, 2024
1 parent fd57dce commit f70c21d
Show file tree
Hide file tree
Showing 35 changed files with 13 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/_run_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ jobs:
run: |
export YARN_ENABLE_HARDENED_MODE=0
if [ "${{ inputs.suite-name == 'ragstack' }}" == "true" ]; then
cd ragstack-ai-ts-e2e-tests
cd packages/ragstack-ai-ts-e2e-tests
YARN_ENABLE_HARDENED_MODE=0 yarn install
yarn run test
elif [ "${{ inputs.suite-name == 'langchain' }}" == "true" ]; then
cd ragstack-ai-ts-e2e-tests
cd packages/ragstack-ai-ts-e2e-tests
rm -rf package.json
mv package.langchain.json package.json
cat package.json | jq '.dependencies'
Expand All @@ -135,7 +135,7 @@ jobs:
commit_ref=$(git rev-parse --short HEAD)
echo "commit-url=https://github.com/datastax/ragstack-ai-ts/commits/${commit_ref}" >> $GITHUB_OUTPUT
elif [ "${{ inputs.suite-name == 'langchain' }}" == "true" ]; then
cd ragstack-ai-ts-e2e-tests
cd packages/ragstack-ai-ts-e2e-tests
langchain_version=$(grep "langchain@npm" yarn.lock | head -1 | awk '{split($0,a,":"); print a[2]}' | tr -d '\"')
echo "commit-url=https://github.com/langchain-ai/langchainjs/releases/tag/${langchain_version}" >> $GITHUB_OUTPUT
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-security-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: ./.github/actions/setup-node
- name: "Install"
run: |
cd ragstack-ai-ts
cd packages/ragstack-ai-ts
yarn install --immutable
- name: Run Snyk to check for vulnerabilities
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@ jobs:
uses: ./.github/actions/setup-node
- name: Install and run unit tests
run: |
cd ragstack-ai-ts
cd packages/ragstack-ai-ts
yarn install
yarn run lint
yarn run test
- name: Install E2E tests
run: |
pwd
git status
cd ragstack-ai-ts-e2e-tests
cd packages/ragstack-ai-ts-e2e-tests
export YARN_ENABLE_HARDENED_MODE=0
yarn install
yarn run lint
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-ragstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ jobs:

- name: "Install"
run: |
cd ragstack-ai-ts
cd packages/ragstack-ai-ts
yarn install --immutable
- name: "Release package"
run: |
cd ragstack-ai-ts
cd packages/ragstack-ai-ts
yarn config set npmAuthToken "${{ secrets.NPM_TOKEN }}"
yarn run release:publish
Expand All @@ -40,4 +40,4 @@ jobs:
run: |
echo "release-number=$(echo ${{ github.ref }} | sed -e 's/refs\/tags\/ragstack-ai-ts-//')" >> $GITHUB_OUTPUT
# TODO: build docker image
# TODO: build docker image
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"node": ">=18"
},
"dependencies": {
"@datastax/ragstack-ai-ts": "file:../ragstack-ai-ts"
"@datastax/ragstack-ai-ts": "workspace:^"
},
"scripts": {
"lint": "eslint .",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ tag="ragstack-ai-ts-$version"
git checkout main
git pull
echo ":: Bumping version to $version"
cd ragstack-ai-ts
cd packages/ragstack-ai-ts
export NEW_VERSION=$version
yarn run release:set-version
cd ..
cd ../..
git commit -am "Release $version"
git tag $tag
git push origin main
git push origin $tag
echo "done."
echo "done."

0 comments on commit f70c21d

Please sign in to comment.