Skip to content

Commit

Permalink
Merge branch 'main' into 11-10-add_debug_cli_methods
Browse files Browse the repository at this point in the history
  • Loading branch information
neekolas committed Nov 11, 2024
2 parents bdb198a + 5e227e3 commit f3a6b45
Show file tree
Hide file tree
Showing 160 changed files with 12,098 additions and 7,856 deletions.
8 changes: 8 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,11 @@ runner = 'wasm-bindgen-test-runner'

[alias]
xtask = "run --package xtask --"
b = "build"
c = "check"
t = "test"
r = "run"
xli = "run --bin xmtp_cli"

[build]
rustflags = ["--cfg", "tracing_unstable"]
23 changes: 23 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: 2
updates:
# Maintain dependencies for cargo
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "weekly"
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
# Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
directory: "/"
schedule:
interval: "weekly"
# Maintain dependencies for yarn
- package-ecosystem: "npm"
directory: "/bindings_wasm"
schedule:
interval: "weekly"
# Maintain dependencies for yarn
- package-ecosystem: "npm"
directory: "/bindings_node"
schedule:
interval: "weekly"
22 changes: 22 additions & 0 deletions .github/workflows/cargo-deny-checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Cargo-Deny Checker
on: [push, pull_request]

jobs:
cargo-deny:
runs-on: warp-ubuntu-latest-x64-16x
strategy:
matrix:
checks:
- advisories
- bans
- licenses
- sources

steps:
- uses: actions/checkout@v3
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check ${{ matrix.checks }}

# Prevent sudden announcement of a new advisory from failing CI
continue-on-error: ${{ matrix.checks == 'advisories' }}
7 changes: 1 addition & 6 deletions .github/workflows/lint-wasm-bindings.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Lint WASM Bindings

on:
pull_request:
paths:
Expand All @@ -15,18 +14,14 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Update rust toolchains
run: rustup update

- name: Cache
uses: Swatinem/rust-cache@v2
with:
workspaces: |
bindings_wasm
- name: Run clippy and fail on warnings
run: cargo clippy --manifest-path bindings_wasm/Cargo.toml --all-features --all-targets --no-deps -- -Dwarnings

run: cargo clippy --manifest-path bindings_wasm/Cargo.toml --all-features --target wasm32-unknown-unknown --no-deps -- -Dwarnings
- name: Run format check
run: cargo fmt --manifest-path bindings_wasm/Cargo.toml --check
5 changes: 3 additions & 2 deletions .github/workflows/lint-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- main
pull_request:
paths:
- ".github/workflows/lint.yaml"
- ".github/workflows/lint-workspace.yaml"
- "mls_validation_service/**"
- "xmtp_api_grpc/**"
- "xmtp_api_http/**"
Expand Down Expand Up @@ -35,6 +35,7 @@ jobs:
workspaces: |
.
- name: Run clippy and fail on warnings
run: cargo clippy --all-features --all-targets --no-deps -- -Dwarnings
# Exclude bindings_wasm since it only compiles for wasm32
run: cargo clippy --workspace --all-features --all-targets --no-deps --exclude bindings_wasm -- -Dwarnings
- name: Run format check
run: cargo fmt --check
8 changes: 4 additions & 4 deletions .github/workflows/release-node-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
if: ${{ ! startsWith(matrix.target, 'aarch64') }}
working-directory: bindings_node
run: |
yarn build --target ${{ matrix.target }}
yarn build:release --target ${{ matrix.target }}
- name: Build target (aaarch64)
if: startsWith(matrix.target, 'aarch64')
Expand All @@ -87,7 +87,7 @@ jobs:
CC: aarch64-linux-gnu-gcc
working-directory: bindings_node
run: |
yarn build --target ${{ matrix.target }}
yarn build:release --target ${{ matrix.target }}
- name: Upload JS
# only upload the JS files once, target doesn't matter
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
- name: Build target
working-directory: bindings_node
run: |
yarn build --target ${{ matrix.target }}
yarn build:release --target ${{ matrix.target }}
- name: Upload binding
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
- name: Build target
working-directory: bindings_node
run: |
yarn build --target ${{ matrix.target }}
yarn build:release --target ${{ matrix.target }}
- name: Upload binding
uses: actions/upload-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-wasm-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
.
bindings_wasm
- name: Install wasm-bindgen and wasm-opt
- name: Install wasm-bindgen
uses: taiki-e/install-action@v2
with:
tool: wasm-bindgen, wasm-opt
tool: wasm-bindgen

- name: Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-node-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Build release
working-directory: bindings_node
run: |
yarn build:release
yarn build
- name: Run tests
working-directory: bindings_node
Expand Down
Loading

0 comments on commit f3a6b45

Please sign in to comment.