Skip to content

Commit

Permalink
Merge branch 'main' into chore/cache-docker-build
Browse files Browse the repository at this point in the history
  • Loading branch information
eike-hass committed Nov 22, 2022
2 parents 7c783a7 + f2bdd3b commit 297fa14
Show file tree
Hide file tree
Showing 162 changed files with 329 additions and 13,123 deletions.
92 changes: 25 additions & 67 deletions .github/actions/release/bump-versions/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,63 +45,20 @@ runs:
run: |
cargo set-version ${{ inputs.version }}
# cargo workspaces ignores examples_legacy/ but cargo release still tries to version it during publishing.
- name: Bump Rust examples_legacy version
shell: bash
if: ${{inputs.release-target == 'rust'}}
working-directory: examples_legacy
run: |
cargo set-version ${{ inputs.version }}
# cargo workspaces ignores the legacy crates because they are excluded from the workspace.
# Bump versions for consistency.
# - name: Bump Rust legacy crates' version
# shell: bash
# if: ${{inputs.release-target == 'rust'}}
# run: |
# cargo set-version --manifest-path identity_account_storage/Cargo.toml ${{ inputs.version }}
# cargo set-version --manifest-path identity_iota_client_legacy/Cargo.toml ${{ inputs.version }}
# cargo set-version --manifest-path identity_iota_core_legacy/Cargo.toml ${{ inputs.version }}
# cargo set-version --manifest-path identity_account/Cargo.toml ${{ inputs.version }}
# cargo add --manifest-path identity_account_storage/Cargo.toml --path identity_core
# cargo add --manifest-path identity_account_storage/Cargo.toml --path identity_did
# cargo add --manifest-path identity_account_storage/Cargo.toml --path identity_iota_core_legacy
# cargo add --manifest-path identity_account/Cargo.toml --path identity_account_storage
# cargo add --manifest-path identity_account/Cargo.toml --path identity_core
# cargo add --manifest-path identity_account/Cargo.toml --path identity_credential
# cargo add --manifest-path identity_account/Cargo.toml --path identity_did
# cargo add --manifest-path identity_account/Cargo.toml --path identity_iota_client_legacy
# cargo add --manifest-path identity_account/Cargo.toml --path identity_iota_core_legacy
# cargo add --manifest-path identity_iota_core_legacy/Cargo.toml --path identity_core
# cargo add --manifest-path identity_iota_core_legacy/Cargo.toml --path identity_did
# cargo add --manifest-path identity_iota_client_legacy/Cargo.toml --path identity_core
# cargo add --manifest-path identity_iota_client_legacy/Cargo.toml --path identity_credential
# cargo add --manifest-path identity_iota_client_legacy/Cargo.toml --path identity_did
# cargo add --manifest-path identity_iota_client_legacy/Cargo.toml --path identity_iota_core_legacy

# cargo workspaces ignores identity_agent because it is excluded from the workspace.
# Bump versions for consistency.
# - name: Bump Rust agent version
# shell: bash
# if: ${{inputs.release-target == 'rust'}}
# working-directory: identity_agent
# run: |
# cargo set-version ${{ inputs.version }}
# cargo add --path ../identity_core

- name: Bump Wasm bindings crate version
shell: bash
if: ${{inputs.release-target == 'wasm'}}
working-directory: bindings/wasm
run: |
cargo workspaces version --force "*" --no-git-commit --exact custom ${{ inputs.version }} -y -a
- name: Bump stronghold nodejs bindings crate version
shell: bash
if: ${{inputs.release-target == 'wasm'}}
working-directory: bindings/stronghold-nodejs
run: |
cargo set-version ${{ inputs.version }}
# Deactivated while the crate is broken, which is the case due to the removal of identity_account_storage.
# - name: Bump stronghold nodejs bindings crate version
# shell: bash
# if: ${{inputs.release-target == 'wasm'}}
# working-directory: bindings/stronghold-nodejs
# run: |
# cargo set-version ${{ inputs.version }}

- name: Replace identity_iota version in Wasm bindings
shell: bash
Expand All @@ -110,15 +67,15 @@ runs:
run: |
cargo add identity_iota --path=../../identity_iota
- name: Replace identity versions in stronghold nodejs bindings
shell: bash
if: ${{inputs.release-target == 'rust'}}
working-directory: bindings/stronghold-nodejs
run: |
cargo add identity_core --path=../../identity_core
cargo add identity_did --path=../../identity_did
cargo add identity_iota_core_legacy --path=../../identity_iota_core_legacy
cargo add identity_account_storage --path=../../identity_account_storage
# Deactivated while the crate is broken, which is the case due to the removal of identity_account_storage.
# - name: Replace identity versions in stronghold nodejs bindings
# shell: bash
# if: ${{inputs.release-target == 'rust'}}
# working-directory: bindings/stronghold-nodejs
# run: |
# cargo add identity_core --path=../../identity_core
# cargo add identity_did --path=../../identity_did
# cargo add identity_iota_core_legacy --path=../../identity_iota_core_legacy

- name: Set up Node.js
uses: actions/setup-node@v2
Expand All @@ -134,11 +91,12 @@ runs:
run: |
npm version ${{ inputs.version }}
- name: Bump stronghold nodejs npm package version
shell: bash
if: ${{inputs.release-target == 'wasm'}}
working-directory: bindings/stronghold-nodejs
run: |
npm version ${{ inputs.version }}
# set peer dependency version
echo "`jq '.peerDependencies."@iota/identity-wasm"="${{ inputs.version }}"' package.json`" > package.json
# Deactivated while the crate is broken, which is the case due to the removal of identity_account_storage.
# - name: Bump stronghold nodejs npm package version
# shell: bash
# if: ${{inputs.release-target == 'wasm'}}
# working-directory: bindings/stronghold-nodejs
# run: |
# npm version ${{ inputs.version }}
# # set peer dependency version
# echo "`jq '.peerDependencies."@iota/identity-wasm"="${{ inputs.version }}"' package.json`" > package.json
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true

- name: Build
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@ jobs:
args: --manifest-path ./bindings/wasm/Cargo.toml --target wasm32-unknown-unknown --all-targets --all-features -- -D warnings
name: wasm

- name: stronghold-nodejs clippy check
uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --manifest-path ./bindings/stronghold-nodejs/Cargo.toml --all-targets --all-features -- -D warnings
name: stronghold-nodejs
# Deactivated while the crate is broken, which is the case due to the removal of identity_account_storage.
# - name: stronghold-nodejs clippy check
# uses: actions-rs/clippy-check@v1
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
# args: --manifest-path ./bindings/stronghold-nodejs/Cargo.toml --all-targets --all-features -- -D warnings
# name: stronghold-nodejs

- name: libjose clippy check
uses: actions-rs/clippy-check@v1
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/coverage.yml

This file was deleted.

15 changes: 9 additions & 6 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ jobs:

steps:
- uses: actions/checkout@v2

# we use nightly to get access to advanced format capabilities
- name: Install rustfmt with nightly toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2022-06-30
toolchain: nightly
override: true
components: rustfmt

Expand All @@ -51,11 +53,12 @@ jobs:
command: fmt
args: --manifest-path ./bindings/wasm/Cargo.toml --all -- --check

- name: stronghold-nodejs fmt check
uses: actions-rs/cargo@v1
with:
command: fmt
args: --manifest-path ./bindings/stronghold-nodejs/Cargo.toml --all -- --check
# Deactivated while the crate is broken, which is the case due to the removal of identity_account_storage.
# - name: stronghold-nodejs fmt check
# uses: actions-rs/cargo@v1
# with:
# command: fmt
# args: --manifest-path ./bindings/stronghold-nodejs/Cargo.toml --all -- --check

- name: libjose fmt check
uses: actions-rs/cargo@v1
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/scripts/coverage.sh

This file was deleted.

1 change: 1 addition & 0 deletions .github/workflows/shared-build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
with:
toolchain: stable
target: wasm32-unknown-unknown
override: true

# Download a pre-compiled wasm-bindgen binary.
- name: Install wasm-bindgen-cli
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
yarn install --immutable
yarn build
# docs.rs also uses nightly so it makes sense to mirror that
- name: Install Rust nightly toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[workspace]
resolver = "2"
members = [
"identity_agent",
# "identity_comm",
"identity_core",
"identity_credential",
Expand All @@ -13,10 +14,6 @@ members = [
]

exclude = [
"identity_account",
"identity_account_storage",
"identity_agent",
"examples_legacy",
"identity_iota_core_legacy",
"bindings/stronghold-nodejs",
"bindings/wasm",
Expand Down
Loading

0 comments on commit 297fa14

Please sign in to comment.