Update all paths for bindings/wasm/identity_wasm in al GH workflows f…

…iles and add clippy + format steps for bindings/wasm/iota_interaction_ts
iotaledger · Jan 8, 2025 · db8fe86 · db8fe86
1 parent 59f02b9
commit db8fe86
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 35 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -17,7 +17,7 @@ on:
       - '**.toml'
       - 'bindings/**'
       - '!bindings/**.md'
-      - 'bindings/wasm/README.md' # the Readme contain txm tests
+      - 'bindings/wasm/identity_wasm/README.md' # the Readme contain txm tests
 
 env:
   RUST_BACKTRACE: full
@@ -172,7 +172,7 @@ jobs:
         # run examples only on ubuntu for now
         if: matrix.os == 'ubuntu-24.04'
         run: |
-          cd bindings/wasm
+          cd bindings/wasm/identity_wasm
           npm ci
           npm run test:readme:rust
 
@@ -211,20 +211,20 @@ jobs:
 
       - name: Install JS dependencies
         run: npm ci
-        working-directory: bindings/wasm
+        working-directory: bindings/wasm/identity_wasm
 
-      - name: Download bindings/wasm artifacts
+      - name: Download bindings/wasm/identity_wasm artifacts
         uses: actions/download-artifact@v4
         with:
           name: identity-wasm-bindings-build
-          path: bindings/wasm
+          path: bindings/wasm/identity_wasm
 
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'
 
       - name: Run Wasm examples
         run: npm run test:readme && npm run test:node
-        working-directory: bindings/wasm
+        working-directory: bindings/wasm/identity_wasm
 
   test-wasm-firefox:
     needs: build-wasm
@@ -247,22 +247,22 @@ jobs:
 
       - name: Install JS dependencies
         run: npm ci
-        working-directory: bindings/wasm
+        working-directory: bindings/wasm/identity_wasm
 
-      - name: Download bindings/wasm artifacts
+      - name: Download bindings/wasm/identity_wasm artifacts
         uses: actions/download-artifact@v4
         with:
           name: identity-wasm-bindings-build
-          path: bindings/wasm
+          path: bindings/wasm/identity_wasm
 
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'
 
       - name: Build Docker image
         uses: docker/[email protected]
         with:
-          context: bindings/wasm/
-          file: bindings/wasm/cypress/Dockerfile
+          context: bindings/wasm/identity_wasm/
+          file: bindings/wasm/identity_wasm/cypress/Dockerfile
           push: false
           tags: cypress-test:latest
           load: true
@@ -291,22 +291,22 @@ jobs:
 
       - name: Install JS dependencies
         run: npm ci
-        working-directory: bindings/wasm
+        working-directory: bindings/wasm/identity_wasm
 
-      - name: Download bindings/wasm artifacts
+      - name: Download bindings/wasm/identity_wasm artifacts
         uses: actions/download-artifact@v4
         with:
           name: identity-wasm-bindings-build
-          path: bindings/wasm
+          path: bindings/wasm/identity_wasm
 
       - name: Start iota sandbox
         uses: './.github/actions/iota-rebase-sandbox/setup'
 
       - name: Build Docker image
         uses: docker/[email protected]
         with:
-          context: bindings/wasm/
-          file: bindings/wasm/cypress/Dockerfile
+          context: bindings/wasm/identity_wasm/
+          file: bindings/wasm/identity_wasm/cypress/Dockerfile
           push: false
           tags: cypress-test:latest
           load: true

diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
@@ -40,8 +40,14 @@ jobs:
         with:
           args: --all-targets --all-features -- -D warnings
 
-      - name: Wasm clippy check
+      - name: Wasm clippy check identity_wasm
         uses: actions-rs-plus/clippy-check@b09a9c37c9df7db8b1a5d52e8fe8e0b6e3d574c4
         if: ${{ false }}
         with:
-          args: --manifest-path ./bindings/wasm/Cargo.toml --target wasm32-unknown-unknown --all-targets --all-features -- -D warnings
+          args: --manifest-path ./bindings/wasm/identity_wasm/Cargo.toml --target wasm32-unknown-unknown --all-targets --all-features -- -D warnings
+
+      - name: Wasm clippy check iota_interaction_ts
+        uses: actions-rs-plus/clippy-check@b09a9c37c9df7db8b1a5d52e8fe8e0b6e3d574c4
+        if: ${{ false }}
+        with:
+          args: --manifest-path ./bindings/wasm/iota_interaction_ts/Cargo.toml --target wasm32-unknown-unknown --all-targets --all-features -- -D warnings
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -45,8 +45,11 @@ jobs:
       - name: core fmt check
         run: cargo +nightly fmt --all -- --check
 
-      - name: wasm fmt check
-        run: cargo +nightly fmt --manifest-path ./bindings/wasm/Cargo.toml --all -- --check
+      - name: wasm fmt check identity_wasm
+        run: cargo +nightly fmt --manifest-path ./bindings/wasm/identity_wasm/Cargo.toml --all -- --check
+
+      - name: wasm fmt check iota_interaction_ts
+        run: cargo +nightly fmt --manifest-path ./bindings/wasm/iota_interaction_ts/Cargo.toml --all -- --check
 
       - name: Cargo.toml fmt check
         run:

diff --git a/.github/workflows/shared-build-wasm.yml b/.github/workflows/shared-build-wasm.yml
@@ -23,7 +23,7 @@ jobs:
   build-wasm:
     defaults:
       run:
-        working-directory: bindings/wasm
+        working-directory: bindings/wasm/identity_wasm
         shell: bash
     runs-on: ubuntu-latest
     strategy:
@@ -50,7 +50,7 @@ jobs:
           target-cache-enabled: true
           sccache-enabled: true
           sccache-path: ${{ matrix.sccache-path }}
-          target-cache-path: bindings/wasm/target
+          target-cache-path: bindings/wasm/identity_wasm/target
 
       # Download a pre-compiled wasm-bindgen binary.
       - name: Install wasm-bindgen-cli
@@ -86,9 +86,9 @@ jobs:
         with:
           name: ${{ inputs.output-artifact-name }}
           path: |
-            bindings/wasm/node
-            bindings/wasm/web
-            bindings/wasm/examples/dist
-            bindings/wasm/docs
+            bindings/wasm/identity_wasm/node
+            bindings/wasm/identity_wasm/web
+            bindings/wasm/identity_wasm/examples/dist
+            bindings/wasm/identity_wasm/docs
           if-no-files-found: error
           retention-days: 1
diff --git a/.github/workflows/wasm-automatic-release-and-publish.yml b/.github/workflows/wasm-automatic-release-and-publish.yml
@@ -14,7 +14,7 @@ jobs:
     # owner/repository of workflow has to be static, see https://github.community/t/env-variables-in-uses/17466
     uses: iotaledger/identity.rs/.github/workflows/shared-release.yml@main
     with:
-      changelog-config-path: ./bindings/wasm/.github_changelog_generator
+      changelog-config-path: ./bindings/wasm/identity_wasm/.github_changelog_generator
       pre-release-tag-regex: ^wasm-v[0-9]+\.[0-9]+\.[0-9]+-(?<pre_release>\w+)\.\d+$
       main-release-tag-regex: ^wasm-v[0-9]+\.[0-9]+\.[0-9]+$
       create-github-release: false

diff --git a/.github/workflows/wasm-create-hotfix-pr.yml b/.github/workflows/wasm-create-hotfix-pr.yml
@@ -16,8 +16,8 @@ jobs:
       branch-regex: ^support\/wasm-v[0-9]+\.[0-9]+$
       tag-prefix: wasm-v
       main-tag-regex: ^wasm-v[0-9]+\.[0-9]+\.[0-9]+$
-      changelog-config-path: ./bindings/wasm/.github_changelog_generator
-      changelog-path: ./bindings/wasm/CHANGELOG.md
+      changelog-config-path: ./bindings/wasm/identity_wasm/.github_changelog_generator
+      changelog-path: ./bindings/wasm/identity_wasm/CHANGELOG.md
       release-target: wasm
     secrets:
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

diff --git a/.github/workflows/wasm-create-release-pr.yml b/.github/workflows/wasm-create-release-pr.yml
@@ -27,8 +27,8 @@ jobs:
       tag-postfix: -${{ github.event.inputs.release-type }}.
       tag-base: ${{ github.event.inputs.version }}
       main-tag-regex: ^wasm-v[0-9]+\.[0-9]+\.[0-9]+$
-      changelog-config-path: ./bindings/wasm/.github_changelog_generator
-      changelog-path: ./bindings/wasm/CHANGELOG.md
+      changelog-config-path: ./bindings/wasm/identity_wasm/.github_changelog_generator
+      changelog-path: ./bindings/wasm/identity_wasm/CHANGELOG.md
       pr-body-text: On merge a pre-release will be published to npm.
       release-target: wasm
     secrets:
@@ -43,8 +43,8 @@ jobs:
       tag-prefix: wasm-v
       tag-base: ${{ github.event.inputs.version }}
       main-tag-regex: ^wasm-v[0-9]+\.[0-9]+\.[0-9]+$
-      changelog-config-path: ./bindings/wasm/.github_changelog_generator
-      changelog-path: ./bindings/wasm/CHANGELOG.md
+      changelog-config-path: ./bindings/wasm/identity_wasm/.github_changelog_generator
+      changelog-path: ./bindings/wasm/identity_wasm/CHANGELOG.md
       release-target: wasm
     secrets:
       GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}

diff --git a/Cargo.toml b/Cargo.toml
@@ -24,10 +24,9 @@ members = [
   "identity_eddsa_verifier",
   "examples",
   "identity_iota_interaction",
-  "bindings/wasm/iota_interaction_ts",
 ]
 
-exclude = ["bindings/wasm/identity_wasm", "bindings/grpc"]
+exclude = ["bindings/wasm/identity_wasm", "bindings/wasm/iota_interaction_ts", "bindings/grpc"]
 
 [workspace.dependencies]
 bls12_381_plus = { version = "0.8.17" }