Merge remote-tracking branch 'origin/main' into spike/oas_clients

Author: aorumbayev

.github/workflows/ci_cd.yml

@@ -14,18 +14,33 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       # The packages that use Uniffi bindings
-      uniffi_packages: ${{ steps.set_uniffi_packages.outputs.uniffi_packages }}
+      ffi_packages: ${{ steps.set_ffi_packages.outputs.ffi_packages }}
     steps:
-      - id: set_uniffi_packages
-        run: echo 'uniffi_packages=["algokit_transact"]' >> $GITHUB_OUTPUT
+      - id: set_ffi_packages
+        run: echo 'ffi_packages=["algokit_transact"]' >> $GITHUB_OUTPUT
 
 
+  typescript_wasm_ci_cd:
+    concurrency: ${{ github.event_name == 'push' && format('cd-{0}', github.ref) || format('ci-typescript_wasm-{0}', github.run_id) }}
+    needs: setup
+    uses: ./.github/workflows/typescript_wasm_ci_cd.yml
+    strategy:
+      matrix:
+        crate: ${{ fromJSON(needs.setup.outputs.ffi_packages) }}
+    with:
+      crate: ${{ matrix.crate }}
+      release: ${{ github.event_name == 'push' }}
+    secrets:
+      BOT_ID: ${{ secrets.BOT_ID }}
+      BOT_SK: ${{ secrets.BOT_SK }}
+  
   python_uniffi_ci_cd:
+    concurrency: ${{ github.event_name == 'push' && format('cd-{0}', github.ref) || format('ci-python_uniffi-{0}', github.run_id) }}
     needs: setup
     uses: ./.github/workflows/python_uniffi_ci_cd.yml
     strategy:
       matrix:
-        crate: ${{ fromJSON(needs.setup.outputs.uniffi_packages) }}
+        crate: ${{ fromJSON(needs.setup.outputs.ffi_packages) }}
     with:
       crate: ${{ matrix.crate }}
       release: ${{ github.event_name == 'push' }}

.github/workflows/python_uniffi_ci_cd.yml

@@ -31,9 +31,8 @@ env:
 
 jobs:
   get_version:
-    if: inputs.release
     runs-on: ubuntu-latest
-    outputs: 
+    outputs:
       tag: ${{ steps.semantic_release.outputs.tag }}
       version: ${{ steps.semantic_release.outputs.version }}
       version_commit_sha: ${{ steps.set_version_commit_sha.outputs.version_commit_sha }}
@@ -42,16 +41,23 @@ jobs:
         working-directory: ./packages/python/${{ inputs.crate }}/
     steps:
       - uses: actions/create-github-app-token@v1
+        if: inputs.release
         id: app_token
         with:
           app-id: ${{ secrets.BOT_ID }}
           private-key: ${{ secrets.BOT_SK }}
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+        if: inputs.release
       - uses: oven-sh/setup-bun@v2
+        if: inputs.release
         with:
           bun-version: latest
       - run: cd ../../../ && bun install
+        if: inputs.release
       - name: Semantic Release (dry-run)
+        if: inputs.release
         id: semantic_release
         env:
           GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
@@ -104,20 +110,36 @@ jobs:
         with:
           toolchain: 1.85.0
           targets: ${{ matrix.target.name }}
+
+      - name: Install Poetry
+        run: |
+          pipx install poetry
+
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          cache: "pip" # caching pip dependencies
+          cache: "poetry"
+          cache-dependency-path: packages/python/${{ inputs.crate }}/poetry.lock
 
-      - name: pip install
+      - name: Poetry install
         run: |
           cd packages/python/${{ inputs.crate }}
-          pip install ".[dev]"
+          poetry install --with dev
+
+      - name: Build wheel
+        run: |
+          cd packages/python/${{ inputs.crate }}
+          poetry run maturin build --release --features ffi_uniffi
+
+      - name: Install wheel
+        run: |
+          cd packages/python/${{ inputs.crate }}
+          poetry run pip install ../../../target/wheels/*.whl --force-reinstall
 
       - name: pytest
         run: |
           cd packages/python/${{ inputs.crate }}
-          pytest
+          poetry run pytest
 
       - name: Upload build artifacts
         if: inputs.release
@@ -188,47 +210,48 @@ jobs:
           RUN: rustup target add ${{ env.TARGET }}
         run: docker exec build-container bash -c "$RUN"
 
-      - name: Install pip-tools
+      - name: Install Poetry
         env:
-          RUN: python${{ env.PYTHON_VERSION }} -m pip install pip-tools
+          RUN: pipx install poetry --python python${{ env.PYTHON_VERSION }}
         run: docker exec build-container bash -c "$RUN"
 
       - name: Install dependencies
         env:
           RUN: |
             set -e
             cd /workspace/packages/python/${{ inputs.crate }}
-            python${{ env.PYTHON_VERSION }} -m piptools compile pyproject.toml --extra dev -o requirements.txt
-            python${{ env.PYTHON_VERSION }} -m pip install -r requirements.txt
+            poetry env use python${{ env.PYTHON_VERSION }}
+            poetry install --with dev
         run: docker exec build-container bash -c "$RUN"
 
       - name: maturin build
         env:
           RUN: |
             cd /workspace/packages/python/${{ inputs.crate }}
-            python${{ env.PYTHON_VERSION }} -m maturin build --release --target ${{ env.TARGET }} --compatibility ${{ env.MANYLINUX }} --features ffi_uniffi
+            poetry run maturin build --release --target ${{ env.TARGET }} --compatibility ${{ env.MANYLINUX }} --features ffi_uniffi
         run: docker exec build-container bash -c "$RUN"
 
-      - name: pip install wheel
+      - name: Install wheel
         env:
-          RUN: python${{ env.PYTHON_VERSION }} -m pip install /workspace/target/wheels/*.whl
+          RUN: |
+            cd /workspace/packages/python/${{ inputs.crate }}
+            poetry run pip install /workspace/target/wheels/*.whl
         run: docker exec build-container bash -c "$RUN"
 
       - name: pytest
         env:
           RUN: |
             cd /workspace/packages/python/${{ inputs.crate }}
-            python${{ env.PYTHON_VERSION }} -m pytest
+            poetry run pytest
         run: docker exec build-container bash -c "$RUN"
-      
+
       - name: Upload build artifacts
         if: inputs.release
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.TARGET }}-wheel
           path: target/wheels
 
-
   release:
     if: inputs.release && needs.get_version.outputs.version != ''
     needs:
@@ -255,6 +278,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
+          merge-multiple: true
 
       - uses: oven-sh/setup-bun@v2
         with:
@@ -267,7 +291,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
         run: "bun semantic-release"
-      
+
   cleanup:
     if: inputs.release && (failure() || cancelled())
     runs-on: ubuntu-latest
@@ -285,8 +309,8 @@ jobs:
       - name: Reset branch
         if: needs.get_version.outputs.version_commit_sha != ''
         env:
-          GITHUB_TOKEN: ${{ steps.app_token.outputs.token }} 
-        run: |  
+          GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
+        run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git revert --no-commit ${{ needs.get_version.outputs.version_commit_sha }}

.github/workflows/typescript_wasm_ci_cd.yml

@@ -0,0 +1,58 @@
+name: TypeScript CI
+
+on:
+  workflow_call:
+    inputs:
+      crate:
+        required: true
+        type: string
+        description: "The name of the crate to build and publish"
+      release:
+        required: false
+        type: boolean
+        default: false
+        description: "Whether to run release steps"
+    secrets:
+      BOT_ID:
+        required: true
+      BOT_SK:
+        required: true
+
+permissions:
+  contents: write # to make commits
+  actions: write # to upload artifacts
+  issues: write # to be able to comment on released issues
+  pull-requests: write # to be able to comment on released pull requests
+
+jobs:
+  build_and_test:
+    defaults:
+      run:
+        shell: bash
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/create-github-app-token@v1
+        if: inputs.release
+        id: app_token
+        with:
+          app-id: ${{ secrets.BOT_ID }}
+          private-key: ${{ secrets.BOT_SK }}
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: 1.85.0
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - run: bun install --frozen-lockfile 
+      - name: Build
+        run: bun scripts/build ${{ inputs.CRATE }} typescript
+      - name: Test
+        run: cd packages/typescript/${{ inputs.CRATE }} && bun test
+      - name: Release
+        if: inputs.release
+        env:
+          GITHUB_TOKEN: ${{ steps.app_token.outputs.token }}
+        run: bun release:${{ inputs.CRATE }}:ts

.gitignore

@@ -8,5 +8,4 @@ node_modules/
 .build
 .bin/
 .vscode/
-
-.DS_Store
+.DS_Store