diff --git a/.github/workflows/jsonrpc-client-npm-package.yml b/.github/workflows/jsonrpc-client-npm-package.yml index d66ed8406..302e2c321 100644 --- a/.github/workflows/jsonrpc-client-npm-package.yml +++ b/.github/workflows/jsonrpc-client-npm-package.yml @@ -33,7 +33,7 @@ jobs: run: npm install -g npm@latest - name: Install dependencies without running scripts - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm install --ignore-scripts - name: Package @@ -43,5 +43,5 @@ jobs: npm pack . - name: Publish - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm publish --provenance deltachat-jsonrpc-client-* --access public diff --git a/.github/workflows/jsonrpc.yml b/.github/workflows/jsonrpc.yml index ca04b617c..fac827a9a 100644 --- a/.github/workflows/jsonrpc.yml +++ b/.github/workflows/jsonrpc.yml @@ -30,16 +30,16 @@ jobs: save-if: ${{ github.ref == 'refs/heads/main' }} cache-bin: false - name: npm install - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm install - name: Build TypeScript, run Rust tests, generate bindings - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm run build - name: Run integration tests - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm run test env: CHATMAIL_DOMAIN: ${{ vars.CHATMAIL_DOMAIN }} - name: Run linter - working-directory: deltachat-jsonrpc/typescript + working-directory: deltachat-jsonrpc-bindings/typescript run: npm run prettier:check diff --git a/.github/workflows/upload-docs.yml b/.github/workflows/upload-docs.yml index d08f1c00b..6b0e00f30 100644 --- a/.github/workflows/upload-docs.yml +++ b/.github/workflows/upload-docs.yml @@ -81,7 +81,7 @@ jobs: defaults: run: - working-directory: ./deltachat-jsonrpc/typescript + working-directory: ./deltachat-jsonrpc-bindings/typescript steps: - uses: actions/checkout@v6 @@ -104,7 +104,7 @@ jobs: mkdir -p "$HOME/.ssh" echo "${{ secrets.JS_JSONRPC_DOCS_SSH_KEY }}" > "$HOME/.ssh/key" chmod 600 "$HOME/.ssh/key" - rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:/var/www/html/js.jsonrpc.delta.chat/" + rsync -avzh --delete -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no" $GITHUB_WORKSPACE/deltachat-jsonrpc-bindings/typescript/docs/ "${{ secrets.JS_JSONRPC_DOCS_SSH_USER }}@js.jsonrpc.delta.chat:/var/www/html/js.jsonrpc.delta.chat/" build-cffi: runs-on: ubuntu-latest diff --git a/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js b/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js index b8acf2069..fa01a0c50 100644 --- a/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js +++ b/deltachat-rpc-server/npm-package/scripts/update_optional_dependencies_and_version.js @@ -56,7 +56,7 @@ for (const { folder_name, package_name } of platform_package_names) { if (is_local) { package_json.peerDependencies["@deltachat/jsonrpc-client"] = - `file:${join(expected_cwd, "/../../deltachat-jsonrpc/typescript")}`; + `file:${join(expected_cwd, "/../../deltachat-jsonrpc-bindings/typescript")}`; } else { package_json.peerDependencies["@deltachat/jsonrpc-client"] = "*"; }